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

rename value_type_forced to value_type

Browse source 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit 3bf206a38e20109bbee9cd781e66bcd895ed95ce)
This commit is contained in:
Philipp 2024-06-14 15:40:11 +02:00 • committed by Robert Hensing
parent 627b31d6c5
commit 19361acb12
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ impl EvalState {
self.context.check_err().unwrap(); self.context.check_err().unwrap();
ValueTypeOrThunk::from_raw(r) ValueTypeOrThunk::from_raw(r)
} }
pub fn value_type_forced(&self, value: &Value) -> Result<ValueType> { pub fn value_type(&self, value: &Value) -> Result<ValueType> {
match self.value_type_unforced(value) { match self.value_type_unforced(value) {
ValueTypeOrThunk::ValueType(a) => Ok(a), ValueTypeOrThunk::ValueType(a) => Ok(a),
ValueTypeOrThunk::Thunk => { ValueTypeOrThunk::Thunk => {
@ -153,7 +153,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_forced(v).unwrap(); let t = self.value_type(v).unwrap();
if t != ValueType::Int { if t != ValueType::Int {
bail!("expected an int, but got a {:?}", t); bail!("expected an int, but got a {:?}", t);
} }
@ -163,7 +163,7 @@ impl EvalState {
/// Evaluate, and require that the value is an attrset. /// Evaluate, and require that the value is an attrset.
/// Returns a list of the keys in the attrset. /// Returns a list of the keys in the attrset.
pub fn require_attrs_names(&self, v: &Value) -> Result<Vec<String>> { pub fn require_attrs_names(&self, v: &Value) -> Result<Vec<String>> {
let t = self.value_type_forced(v)?; let t = self.value_type(v)?;
if t != ValueType::AttrSet { if t != ValueType::AttrSet {
bail!("expected an attrset, but got a {:?}", t); 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. /// 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>> { pub fn require_attrs_select_opt(&self, v: &Value, attr_name: &str) -> Result<Option<Value>> {
let t = self.value_type_forced(v)?; let t = self.value_type(v)?;
if t != ValueType::AttrSet { if t != ValueType::AttrSet {
bail!("expected an attrset, but got a {:?}", t); 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 /// 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> { pub fn require_string(&self, value: &Value) -> Result<String> {
let t = self.value_type_forced(value)?; let t = self.value_type(value)?;
if t != ValueType::String { if t != ValueType::String {
bail!("expected a string, but got a {:?}", t); bail!("expected a string, but got a {:?}", t);
} }
@ -275,7 +275,7 @@ impl EvalState {
value: &Value, value: &Value,
is_import_from_derivation: bool, is_import_from_derivation: bool,
) -> Result<RealisedString> { ) -> Result<RealisedString> {
let t = self.value_type_forced(value)?; let t = self.value_type(value)?;
if t != ValueType::String { if t != ValueType::String {
bail!("expected a string, but got a {:?}", t); bail!("expected a string, but got a {:?}", t);
} }