From 52b7a762681fb04ae9387c2f1951a36bf83ebc79 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 27 Feb 2023 13:44:06 +0300 Subject: chore(tvix/eval): remove `From for NixString` instance 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 Tested-by: BuildkiteCI --- tvix/eval/src/compiler/bindings.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix/eval/src/compiler/bindings.rs') 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; -- cgit 1.4.1