From c775792b632f2041c203513db3b973ad8e934ce2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 14 Jun 2024 15:50:07 +0200 Subject: [PATCH] fix: Do not unwrap() in require_int (cherry picked from commit c7d2e3e02a977424634ee12015265906e18039a0) --- rust/nix-expr/src/eval_state.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rust/nix-expr/src/eval_state.rs b/rust/nix-expr/src/eval_state.rs index 705d8a4..ce1de17 100644 --- a/rust/nix-expr/src/eval_state.rs +++ b/rust/nix-expr/src/eval_state.rs @@ -135,6 +135,7 @@ impl EvalState { } pub fn value_type_unforced(&self, value: &Value) -> Option { let r = unsafe { raw::get_type(self.context.ptr(), value.raw_ptr()) }; + // .unwrap(): no reason for this to fail, as it does not evaluate self.context.check_err().unwrap(); ValueType::from_raw(r) } @@ -153,7 +154,7 @@ impl EvalState { } } pub fn require_int(&self, v: &Value) -> Result { - let t = self.value_type(v).unwrap(); + let t = self.value_type(v)?; if t != ValueType::Int { bail!("expected an int, but got a {:?}", t); }