lint

HyperQuark · Mar 16, 2024 · 8c7f02e · 8c7f02e
1 parent fe36391
commit 8c7f02e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 29 deletions.
diff --git a/src/ir.rs b/src/ir.rs
@@ -370,16 +370,15 @@ impl TypeStack {
     }
 }
 
+#[allow(clippy::len_without_is_empty)]
 pub trait TypeStackImpl {
     fn get(&self, i: usize) -> Rc<RefCell<Option<TypeStack>>>;
     fn len(&self) -> usize;
 }
 
 impl TypeStackImpl for Rc<RefCell<Option<TypeStack>>> {
     fn get(&self, i: usize) -> Rc<RefCell<Option<TypeStack>>> {
-        if self.borrow().is_none() {
-            Rc::clone(self)
-        } else if i == 0 {
+        if i == 0 || self.borrow().is_none() {
             Rc::clone(self)
         } else {
             self.borrow().clone().unwrap().0.get(i - 1)
@@ -532,10 +531,9 @@ impl InputType {
     }
 
     pub fn least_restrictive_concrete_type(&self) -> InputType {
-        use InputType::*;
         match self.base_type() {
-            Union(a, _) => a.least_restrictive_concrete_type(),
-            a @ _ => a.clone(),
+            InputType::Union(a, _) => a.least_restrictive_concrete_type(),
+            other => other.clone(),
         }
     }
 
@@ -550,8 +548,6 @@ impl InputType {
     }
 }
 
-type OutputType = Option<InputType>;
-
 impl IrOpcode {
     pub fn does_request_redraw(&self) -> bool {
         use IrOpcode::*;
@@ -1627,18 +1623,15 @@ impl IrBlockVec for Vec<IrBlock> {
                         let cast_stack = self.get_type_stack(Some(cast_pos));
                         let cast_block = IrBlock::new_with_stack_no_cast(
                             IrOpcode::hq_cast(
-                                {
-                                    let from = cast_stack
-                                        .borrow()
-                                        .clone()
-                                        .ok_or(make_hq_bug!(
-                                            "tried to cast to {:?} from empty type stack at {:?}",
-                                            cast_type.clone(),
-                                            op
-                                        ))?
-                                        .1;
-                                    from
-                                },
+                                cast_stack
+                                    .borrow()
+                                    .clone()
+                                    .ok_or(make_hq_bug!(
+                                        "tried to cast to {:?} from empty type stack at {:?}",
+                                        cast_type.clone(),
+                                        op
+                                    ))?
+                                    .1,
                                 cast_type.clone(),
                             ),
                             cast_stack,
@@ -1698,11 +1691,7 @@ pub fn step_from_top_block<'a>(
         {
             next_id = last_nexts.pop();
         } else {
-            next_id = next_block
-                .block_info()
-                .ok_or(make_hq_bug!(""))?
-                .next
-                .clone();
+            next_id.clone_from(next_block.block_info().ok_or(make_hq_bug!(""))?.next);
         }
         if ops.is_empty() {
             hq_bug!("assertion failed: !ops.is_empty()")

diff --git a/src/targets/wasm.rs b/src/targets/wasm.rs
@@ -1394,10 +1394,7 @@ impl TryFrom<IrProject> for WasmProject {
             [ValType::I64],
         );
         types.function(
-            [
-                ValType::F64,
-                ValType::Ref(RefType::EXTERNREF),
-            ],
+            [ValType::F64, ValType::Ref(RefType::EXTERNREF)],
             [ValType::Ref(RefType::EXTERNREF)],
         );