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

refact: adjust ValueType use sites

Browse source 
(cherry picked from commit 9d9f7d59c6df3db26f331e63c9b210f8fae19061)
This commit is contained in:
Philipp Zander 2024-06-03 04:20:17 +02:00 • committed by Robert Hensing
parent 673f80e243
commit 627b31d6c5
1 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ impl EvalState {
}
}
pub fn require_int(&self, v: &Value) -> Result<Int> {
let t = self.value_type(v).unwrap();
let t = self.value_type_forced(v).unwrap();
if t != ValueType::Int {
bail!("expected an int, but got a {:?}", t);
}
@ -163,7 +163,7 @@ impl EvalState {
/// Evaluate, and require that the value is an attrset.
/// Returns a list of the keys in the attrset.
pub fn require_attrs_names(&self, v: &Value) -> Result<Vec<String>> {
let t = self.value_type(v)?;
let t = self.value_type_forced(v)?;
if t != ValueType::AttrSet {
bail!("expected an attrset, but got a {:?}", t);
}
@ -202,7 +202,7 @@ impl EvalState {
/// Evaluate, require that the value is an attrset, and select an attribute by name.
pub fn require_attrs_select_opt(&self, v: &Value, attr_name: &str) -> Result<Option<Value>> {
let t = self.value_type(v)?;
let t = self.value_type_forced(v)?;
if t != ValueType::AttrSet {
bail!("expected an attrset, but got a {:?}", t);
}
@ -264,7 +264,7 @@ impl EvalState {
}
/// NOTE: this will be replaced by two methods, one that also returns the context, and one that checks that the context is empty
pub fn require_string(&self, value: &Value) -> Result<String> {
let t = self.value_type(value)?;
let t = self.value_type_forced(value)?;
if t != ValueType::String {
bail!("expected a string, but got a {:?}", t);
}
@ -275,7 +275,7 @@ impl EvalState {
value: &Value,
is_import_from_derivation: bool,
) -> Result<RealisedString> {
let t = self.value_type(value)?;
let t = self.value_type_forced(value)?;
if t != ValueType::String {
bail!("expected a string, but got a {:?}", t);
}
@ -487,10 +487,10 @@ mod tests {
let v = es.eval_from_string("1", "<test>").unwrap();
let v2 = v.clone();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::Int);
let t2 = es.value_type(&v2).unwrap();
assert!(t2 == ValueType::Int);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::Int));
let t2 = es.value_type_unforced(&v2);
assert!(t2 == ValueTypeOrThunk::ValueType(ValueType::Int));
gc_now();
})
.unwrap();
@ -503,8 +503,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.eval_from_string("true", "<test>").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::Bool);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::Bool));
})
.unwrap();
}
@ -531,8 +531,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.eval_from_string("{ }", "<test>").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::AttrSet);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::AttrSet));
let attrs = es.require_attrs_names(&v).unwrap();
assert_eq!(attrs.len(), 0);
})
@ -652,8 +652,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.eval_from_string("\"hello\"", "<test>").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::String);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::String));
let s = es.require_string(&v).unwrap();
assert!(s == "hello");
})
@ -704,8 +704,8 @@ mod tests {
.eval_from_string("builtins.substring 0 1 \"ü\"", "<test>")
.unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::String);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::String));
let r = es.require_string(&v);
assert!(r.is_err());
assert!(r
@ -725,8 +725,8 @@ mod tests {
.eval_from_string("(derivation { name = \"hello\"; system = \"dummy\"; builder = \"cmd.exe\"; }).outPath", "<test>")
.unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::String);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::String));
// TODO
// let r = es.require_string_without_context(&v);
// assert!(r.is_err());
@ -742,8 +742,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.new_value_str("hello").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::String);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::String));
let s = es.require_string(&v).unwrap();
assert!(s == "hello");
})
@ -757,8 +757,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.new_value_str("").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::String);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::String));
let s = es.require_string(&v).unwrap();
assert!(s == "");
})
@ -791,8 +791,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.new_value_int(42).unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::Int);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::Int));
let i = es.require_int(&v).unwrap();
assert!(i == 42);
})
@ -806,8 +806,8 @@ mod tests {
let es = EvalState::new(store, []).unwrap();
let v = es.eval_from_string("{ }", "<test>").unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::AttrSet);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::AttrSet));
})
.unwrap();
}
@ -821,8 +821,8 @@ mod tests {
.eval_from_string("[ ]", "<test>")
.unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::List);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::List));
})
.unwrap();
}
@ -883,8 +883,8 @@ mod tests {
let a = es.eval_from_string("2", "<test>").unwrap();
let v = es.call(f, a).unwrap();
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::Int);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::Int));
let i = es.require_int(&v).unwrap();
assert!(i == 3);
})
@ -900,10 +900,10 @@ mod tests {
let f = es.eval_from_string("x: x + 1", "<test>").unwrap();
let a = es.eval_from_string("2", "<test>").unwrap();
let v = es.new_value_apply(&f, &a).unwrap();
assert!(es.value_is_thunk(&v));
assert!(es.value_type_unforced(&v) == ValueTypeOrThunk::Thunk);
es.force(&v).unwrap();
let t = es.value_type(&v).unwrap();
assert!(t == ValueType::Int);
let t = es.value_type_unforced(&v);
assert!(t == ValueTypeOrThunk::ValueType(ValueType::Int));
let i = es.require_int(&v).unwrap();
assert!(i == 3);
})