From c8276c1729b8b8d4197d5c86f095296b8a537392 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Wed, 28 May 2025 22:47:35 +0800 Subject: [PATCH] chore: cargo clippy --- src/builtins/mod.rs | 4 ++-- src/jit/mod.rs | 5 ++--- src/ty/internal/attrset.rs | 2 +- src/ty/internal/func.rs | 4 ++-- src/ty/internal/mod.rs | 2 +- src/ty/internal/primop.rs | 2 +- src/vm/mod.rs | 8 ++++---- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/builtins/mod.rs b/src/builtins/mod.rs index fbcba68..9a0af14 100644 --- a/src/builtins/mod.rs +++ b/src/builtins/mod.rs @@ -68,7 +68,7 @@ pub fn env<'gc>(vm: &VM, mc: &Mutation<'gc>) -> Gc<'gc, VmEnv<'gc>> { let primop = Gc::new(mc, primop); env_map.insert( vm.new_sym(format!("__{}", primop.name)), - Value::PrimOp(primop.clone()), + Value::PrimOp(primop), ); map.insert(vm.new_sym(primop.name), Value::PrimOp(primop)); } @@ -83,5 +83,5 @@ pub fn env<'gc>(vm: &VM, mc: &Mutation<'gc>) -> Gc<'gc, VmEnv<'gc>> { let builtins = Value::AttrSet(attrs); env_map.insert(sym, builtins); - VmEnv::new(Gc::new(mc, env_map.into()), mc) + VmEnv::new(Gc::new(mc, env_map), mc) } diff --git a/src/jit/mod.rs b/src/jit/mod.rs index 8bc3fca..b4be69d 100644 --- a/src/jit/mod.rs +++ b/src/jit/mod.rs @@ -199,7 +199,7 @@ impl<'gc> JITContext<'gc> { pub fn compile_seq( &self, - opcodes: impl Iterator + ExactSizeIterator + DoubleEndedIterator, + opcodes: impl ExactSizeIterator + DoubleEndedIterator, vm: &'gc VM<'gc>, ) -> Result> { let mut stack = Stack::<_, STACK_SIZE>::new(); @@ -330,8 +330,7 @@ impl<'gc> JITContext<'gc> { "call_capture_env", )? .try_as_basic_value() - .unwrap_left() - .into(), + .unwrap_left(), )?, OpCode::ForceValue => { let thunk = stack.pop(); diff --git a/src/ty/internal/attrset.rs b/src/ty/internal/attrset.rs index 8ff11bb..fd03105 100644 --- a/src/ty/internal/attrset.rs +++ b/src/ty/internal/attrset.rs @@ -32,7 +32,7 @@ impl<'gc> Deref for AttrSet<'gc> { } } -impl<'jit: 'vm, 'vm, 'gc> AttrSet<'gc> { +impl<'gc> AttrSet<'gc> { pub fn with_capacity(cap: usize) -> Self { AttrSet { data: HashMap::with_capacity(cap), diff --git a/src/ty/internal/func.rs b/src/ty/internal/func.rs index 26b88d5..75c2ef4 100644 --- a/src/ty/internal/func.rs +++ b/src/ty/internal/func.rs @@ -102,7 +102,7 @@ impl<'gc> Func<'gc> { .select(formal) .or_else(|| { default - .map(|idx| Value::Thunk(Thunk::new(vm.get_thunk(idx), mc).into())) + .map(|idx| Value::Thunk(Thunk::new(vm.get_thunk(idx), mc))) }) .unwrap(); new.insert(formal, arg); @@ -110,7 +110,7 @@ impl<'gc> Func<'gc> { if let Some(alias) = alias { new.insert(alias, Value::AttrSet(arg)); } - env.enter_let(Gc::new(mc, new.into()), mc) + env.enter_let(Gc::new(mc, new), mc) } }; diff --git a/src/ty/internal/mod.rs b/src/ty/internal/mod.rs index 84e9f42..1e58b89 100644 --- a/src/ty/internal/mod.rs +++ b/src/ty/internal/mod.rs @@ -177,7 +177,7 @@ impl<'gc> Value<'gc> { } } -impl<'jit: 'vm, 'vm, 'gc> PartialEq for Value<'gc> { +impl<'gc> PartialEq for Value<'gc> { fn eq(&self, other: &Self) -> bool { use Value::*; match (self, other) { diff --git a/src/ty/internal/primop.rs b/src/ty/internal/primop.rs index b5e13d7..392754c 100644 --- a/src/ty/internal/primop.rs +++ b/src/ty/internal/primop.rs @@ -51,7 +51,7 @@ pub struct PartialPrimOp<'gc> { func: fn(Vec>, &VM, &Mutation<'gc>) -> Result>, } -unsafe impl<'jit: 'vm, 'vm, 'gc> Collect<'gc> for PartialPrimOp<'gc> { +unsafe impl<'gc> Collect<'gc> for PartialPrimOp<'gc> { fn trace>(&self, cc: &mut Tr) { for v in self.args.iter() { v.trace(cc); diff --git a/src/vm/mod.rs b/src/vm/mod.rs index f391f99..f5faad0 100644 --- a/src/vm/mod.rs +++ b/src/vm/mod.rs @@ -119,7 +119,7 @@ pub fn eval FnOnce(Value<'gc>, &mut GcRoot<'gc>, &Mutation<'gc>) .or_else(|| { default.map(|idx| { Value::Thunk( - Thunk::new(root.vm.get_thunk(idx), mc).into(), + Thunk::new(root.vm.get_thunk(idx), mc), ) }) }) @@ -129,7 +129,7 @@ pub fn eval FnOnce(Value<'gc>, &mut GcRoot<'gc>, &Mutation<'gc>) if let Some(alias) = alias { new.insert(alias, Value::AttrSet(arg)); } - env.enter_let(Gc::new(mc, new.into()), mc) + env.enter_let(Gc::new(mc, new), mc) } }; let count = func.count.get(); @@ -283,7 +283,7 @@ fn single_op<'gc, const CAP: usize>( .iter() .map(|(&k, v)| (k, v.clone())) .collect_into(&mut new); - *env = env.enter_let(Gc::new(mc, new.into()), mc); + *env = env.enter_let(Gc::new(mc, new), mc); stack .tos_mut() .as_mut(mc) @@ -344,7 +344,7 @@ fn single_op<'gc, const CAP: usize>( .iter() .map(|(&k, v)| (k, v.clone())) .collect_into(&mut new); - *env = env.enter_let(Gc::new(mc, new.into()), mc); + *env = env.enter_let(Gc::new(mc, new), mc); } OpCode::LeaveEnv => *env = env.leave(), OpCode::EnterWithEnv => {