Merge pull request #918 from g-r-a-n-t/satisfy-clippy

clippy
ethereum · Aug 25, 2023 · 325daac · 325daac
2 parents 6ba3f04 + 7fc3716
commit 325daac
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 3 deletions.
diff --git a/crates/analyzer/src/db.rs b/crates/analyzer/src/db.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use crate::namespace::items::{
     self, AttributeId, ContractFieldId, ContractId, DepGraphWrapper, EnumVariantKind, FunctionId,
     FunctionSigId, ImplId, IngotId, Item, ModuleConstantId, ModuleId, StructFieldId, StructId,

diff --git a/crates/analyzer/src/db/queries/module.rs b/crates/analyzer/src/db/queries/module.rs
@@ -560,7 +560,7 @@ pub fn module_used_item_map(
         )
         .value;
 
-        items.extend(Rc::try_unwrap(prelude_items).unwrap().into_iter());
+        items.extend(Rc::try_unwrap(prelude_items).unwrap());
     }
 
     Analysis::new(Rc::new(items), diagnostics.into())

diff --git a/crates/codegen/src/db.rs b/crates/codegen/src/db.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use std::rc::Rc;
 
 use fe_abi::{contract::AbiContract, event::AbiEvent, function::AbiFunction, types::AbiType};

diff --git a/crates/codegen/src/yul/runtime/mod.rs b/crates/codegen/src/yul/runtime/mod.rs
@@ -383,7 +383,7 @@ impl RuntimeProvider for DefaultRuntimeProvider {
         }
 
         let deref_ty = ptr_ty.deref(db.upcast());
-        let args = std::iter::once(ptr).chain(args.into_iter()).collect();
+        let args = std::iter::once(ptr).chain(args).collect();
         let legalized_ty = db.codegen_legalized_type(ptr_ty);
         if deref_ty.is_enum(db.upcast()) {
             let mut name = format!("enum_init_{}", ptr_ty.0);

diff --git a/crates/common/src/db.rs b/crates/common/src/db.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use crate::files::{File, SourceFileId, Utf8Path};
 use codespan_reporting as cs;
 use salsa;

diff --git a/crates/mir/src/db.rs b/crates/mir/src/db.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use std::{collections::BTreeMap, rc::Rc};
 
 use fe_analyzer::{

diff --git a/crates/mir/src/lower/function.rs b/crates/mir/src/lower/function.rs
@@ -1082,7 +1082,7 @@ impl<'db, 'a> BodyLowerHelper<'db, 'a> {
                 let enum_args = if data_ty.is_unit(self.db) {
                     vec![tag, self.make_unit()]
                 } else {
-                    std::iter::once(tag).chain(args.into_iter()).collect()
+                    std::iter::once(tag).chain(args).collect()
                 };
                 self.builder.aggregate_construct(ty, enum_args, source)
             }

diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs
@@ -79,6 +79,7 @@ pub fn parse_struct_def(
     ))
 }
 
+#[allow(clippy::unnecessary_literal_unwrap)]
 /// Parse a [`ModuleStmt::Enum`].
 /// # Panics
 /// Panics if the next token isn't [`TokenKind::Enum`].