about summary refs log tree commit diff
path: root/tvix/eval/src/compiler
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-02-27T10·44+0300
committertazjin <tazjin@tvl.su>2023-03-13T20·30+0000
commit52b7a762681fb04ae9387c2f1951a36bf83ebc79 (patch)
tree11432f1f1ea840424d19b308370be40516db3b7f /tvix/eval/src/compiler
parent1941082cbb4aa977bc5210516536efdbf96b927c (diff)
chore(tvix/eval): remove `From<SmolStr> for NixString` instance r/5968
No longer needed, and in some cases caused some extra work.

Change-Id: I64e8e7292573bdc92a9c7a8e470e33f8c526f311
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8152
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/compiler')
-rw-r--r--tvix/eval/src/compiler/bindings.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/tvix/eval/src/compiler/bindings.rs b/tvix/eval/src/compiler/bindings.rs
index 9ce50d36db3e..2e703aadc876 100644
--- a/tvix/eval/src/compiler/bindings.rs
+++ b/tvix/eval/src/compiler/bindings.rs
@@ -361,7 +361,7 @@ impl Compiler<'_> {
 
                         // Place key on the stack when compiling attribute sets.
                         if kind.is_attrs() {
-                            self.emit_constant(Value::String(name.clone().into()), &attr);
+                            self.emit_constant(Value::String(name.as_str().into()), &attr);
                             let span = self.span_for(&attr);
                             self.scope_mut().declare_phantom(span, true);
                         }
@@ -569,7 +569,7 @@ impl Compiler<'_> {
 
                 KeySlot::Static { slot, name } => {
                     let span = self.scope()[slot].span;
-                    self.emit_constant(Value::String(name.into()), &span);
+                    self.emit_constant(Value::String(name.as_str().into()), &span);
                     self.scope_mut().mark_initialised(slot);
                 }
 
@@ -593,7 +593,7 @@ impl Compiler<'_> {
                         c.compile(s, namespace.clone());
                         c.emit_force(&namespace);
 
-                        c.emit_constant(Value::String(name.into()), &span);
+                        c.emit_constant(Value::String(name.as_str().into()), &span);
                         c.push_op(OpCode::OpAttrsSelect, &span);
                     })
                 }
@@ -681,7 +681,7 @@ impl Compiler<'_> {
         // (OpAttrs consumes all of these locals).
         self.scope_mut().end_scope();
 
-        self.emit_constant(Value::String(SmolStr::new_inline("body").into()), node);
+        self.emit_constant(Value::String("body".into()), node);
         self.push_op(OpCode::OpAttrsSelect, node);
     }
 
@@ -726,7 +726,7 @@ impl Compiler<'_> {
                 if self.has_dynamic_ancestor() {
                     self.thunk(slot, node, |c, _| {
                         c.context_mut().captures_with_stack = true;
-                        c.emit_constant(Value::String(SmolStr::new(ident).into()), node);
+                        c.emit_constant(Value::String(ident.into()), node);
                         c.push_op(OpCode::OpResolveWith, node);
                     });
                     return;