cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Do not unwrap() in require_int

Browse source 
(cherry picked from commit c7d2e3e02a977424634ee12015265906e18039a0)
This commit is contained in:
Robert Hensing 2024-06-14 15:50:07 +02:00
parent 22ffd20c53
commit c775792b63
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rust/nix-expr/src/eval_state.rs
View file

@ -135,6 +135,7 @@ impl EvalState {
} }
pub fn value_type_unforced(&self, value: &Value) -> Option<ValueType> { pub fn value_type_unforced(&self, value: &Value) -> Option<ValueType> {
let r = unsafe { raw::get_type(self.context.ptr(), value.raw_ptr()) }; 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(); self.context.check_err().unwrap();
ValueType::from_raw(r) ValueType::from_raw(r)
} }
@ -153,7 +154,7 @@ impl EvalState {
} }
} }
pub fn require_int(&self, v: &Value) -> Result<Int> { pub fn require_int(&self, v: &Value) -> Result<Int> {
let t = self.value_type(v).unwrap(); let t = self.value_type(v)?;
if t != ValueType::Int { if t != ValueType::Int {
bail!("expected an int, but got a {:?}", t); bail!("expected an int, but got a {:?}", t);
} }