From ab9407bded75d184ed694afe3564230fd09578ed Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 14 Aug 2022 02:51:09 +0300
Subject: fix(tvix/eval): address various clippy lints

Change-Id: I3ea0f51475e80948adfeb5d1620c1f2665cc39bc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6201
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 tvix/eval/src/vm.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tvix/eval/src/vm.rs')

diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index 0d0249e3f6..f96a5dcbdd 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -159,15 +159,15 @@ impl VM {
                 OpCode::OpAttrPath(count) => self.run_attr_path(count)?,
 
                 OpCode::OpAttrsUpdate => {
-                    let rhs = self.pop().as_attrs()?;
-                    let lhs = self.pop().as_attrs()?;
+                    let rhs = self.pop().to_attrs()?;
+                    let lhs = self.pop().to_attrs()?;
 
                     self.push(Value::Attrs(Rc::new(lhs.update(&rhs))))
                 }
 
                 OpCode::OpAttrsSelect => {
-                    let key = self.pop().as_string()?;
-                    let attrs = self.pop().as_attrs()?;
+                    let key = self.pop().to_string()?;
+                    let attrs = self.pop().to_attrs()?;
 
                     match attrs.select(key.as_str()) {
                         Some(value) => self.push(value.clone()),
@@ -181,8 +181,8 @@ impl VM {
                 }
 
                 OpCode::OpAttrOrNotFound => {
-                    let key = self.pop().as_string()?;
-                    let attrs = self.pop().as_attrs()?;
+                    let key = self.pop().to_string()?;
+                    let attrs = self.pop().to_attrs()?;
 
                     match attrs.select(key.as_str()) {
                         Some(value) => self.push(value.clone()),
@@ -191,8 +191,8 @@ impl VM {
                 }
 
                 OpCode::OpAttrsIsSet => {
-                    let key = self.pop().as_string()?;
-                    let attrs = self.pop().as_attrs()?;
+                    let key = self.pop().to_string()?;
+                    let attrs = self.pop().to_attrs()?;
                     let result = Value::Bool(attrs.select(key.as_str()).is_some());
                     self.push(result);
                 }
@@ -204,8 +204,8 @@ impl VM {
                 }
 
                 OpCode::OpConcat => {
-                    let rhs = self.pop().as_list()?;
-                    let lhs = self.pop().as_list()?;
+                    let rhs = self.pop().to_list()?;
+                    let lhs = self.pop().to_list()?;
                     self.push(Value::List(lhs.concat(&rhs)))
                 }
 
@@ -290,7 +290,7 @@ impl VM {
         let mut path = Vec::with_capacity(count);
 
         for _ in 0..count {
-            path.push(self.pop().as_string()?);
+            path.push(self.pop().to_string()?);
         }
 
         self.push(Value::AttrPath(path));
@@ -310,7 +310,7 @@ impl VM {
         let mut out = String::new();
 
         for _ in 0..count {
-            out.push_str(&self.pop().as_string()?.as_str());
+            out.push_str(self.pop().to_string()?.as_str());
         }
 
         self.push(Value::String(out.into()));
-- 
cgit 1.4.1