Fix clippy warnings (#2331)

pvdrz · web-flow · commit 83426897af20 · 2022-11-02T13:32:32.000-05:00
diff --git a/bindgen/codegen/mod.rs b/bindgen/codegen/mod.rs
@@ -85,7 +85,7 @@ fn root_import(
     let mut path = top_level_path(ctx, module);
 
     let root = ctx.root_module().canonical_name(ctx);
-    let root_ident = ctx.rust_ident(&root);
+    let root_ident = ctx.rust_ident(root);
     path.push(quote! { #root_ident });
 
     let mut tokens = quote! {};
@@ -797,7 +797,7 @@ impl CodeGenerator for Type {
                     }
                 };
 
-                let rust_name = ctx.rust_ident(&name);
+                let rust_name = ctx.rust_ident(name);
 
                 let mut tokens = if let Some(comment) = item.comment(ctx) {
                     attributes::doc(comment)
@@ -1076,7 +1076,7 @@ impl<'a> CodeGenerator for Vtable<'a> {
     ) {
         assert_eq!(item.id(), self.item_id);
         debug_assert!(item.is_enabled_for_codegen(ctx));
-        let name = ctx.rust_ident(&self.canonical_name(ctx));
+        let name = ctx.rust_ident(self.canonical_name(ctx));
 
         // For now, we will only generate vtables for classes that:
         // - do not inherit from others (compilers merge VTable from primary parent class).
@@ -1582,7 +1582,7 @@ impl<'a> FieldCodegen<'a> for BitfieldUnit {
 
         {
             let align_field_name = format!("_bitfield_align_{}", self.nth());
-            let align_field_ident = ctx.rust_ident(&align_field_name);
+            let align_field_ident = ctx.rust_ident(align_field_name);
             let align_ty = match self.layout().align {
                 n if n >= 8 => quote! { u64 },
                 4 => quote! { u32 },
@@ -3875,7 +3875,7 @@ impl TryToRustTy for Type {
             }
             TypeKind::TypeParam => {
                 let name = item.canonical_name(ctx);
-                let ident = ctx.rust_ident(&name);
+                let ident = ctx.rust_ident(name);
                 Ok(quote! {
                     #ident
                 })
diff --git a/bindgen/ir/context.rs b/bindgen/ir/context.rs
@@ -2076,7 +2076,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
             self.in_codegen_phase(),
             "You're not supposed to call this yet"
         );
-        self.options.opaque_types.matches(&path[1..].join("::"))
+        self.options.opaque_types.matches(path[1..].join("::"))
     }
 
     /// Get the options used to configure this bindgen context.
@@ -2314,7 +2314,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
                                 if self
                                     .options()
                                     .allowlisted_files
-                                    .matches(&filename)
+                                    .matches(filename)
                                 {
                                     return true;
                                 }
@@ -2389,7 +2389,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
                                 );
                                 let name = prefix_path[1..].join("::");
                                 prefix_path.pop().unwrap();
-                                self.options().allowlisted_vars.matches(&name)
+                                self.options().allowlisted_vars.matches(name)
                             })
                         }
                     }
@@ -2671,37 +2671,37 @@ If you encounter an error missing from this list, please file an issue or a PR!"
     /// Check if `--no-partialeq` flag is enabled for this item.
     pub fn no_partialeq_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_partialeq_types.matches(&name)
+        self.options().no_partialeq_types.matches(name)
     }
 
     /// Check if `--no-copy` flag is enabled for this item.
     pub fn no_copy_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_copy_types.matches(&name)
+        self.options().no_copy_types.matches(name)
     }
 
     /// Check if `--no-debug` flag is enabled for this item.
     pub fn no_debug_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_debug_types.matches(&name)
+        self.options().no_debug_types.matches(name)
     }
 
     /// Check if `--no-default` flag is enabled for this item.
     pub fn no_default_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_default_types.matches(&name)
+        self.options().no_default_types.matches(name)
     }
 
     /// Check if `--no-hash` flag is enabled for this item.
     pub fn no_hash_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_hash_types.matches(&name)
+        self.options().no_hash_types.matches(name)
     }
 
     /// Check if `--must-use-type` flag is enabled for this item.
     pub fn must_use_type_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().must_use_types.matches(&name)
+        self.options().must_use_types.matches(name)
     }
 }
 
diff --git a/bindgen/ir/enum_ty.rs b/bindgen/ir/enum_ty.rs
@@ -156,7 +156,7 @@ impl Enum {
         let path = item.path_for_allowlisting(ctx);
         let enum_ty = item.expect_type();
 
-        if enums.matches(&path[1..].join("::")) {
+        if enums.matches(path[1..].join("::")) {
             return true;
         }
 
diff --git a/bindgen/ir/item.rs b/bindgen/ir/item.rs
@@ -650,7 +650,7 @@ impl Item {
             if let Some(location) = &self.location {
                 let (file, _, _, _) = location.location();
                 if let Some(filename) = file.name() {
-                    if ctx.options().blocklisted_files.matches(&filename) {
+                    if ctx.options().blocklisted_files.matches(filename) {
                         return true;
                     }
                 }
diff --git a/bindgen/lib.rs b/bindgen/lib.rs
@@ -1640,7 +1640,7 @@ impl Builder {
             wrapper_file.write_all(wrapper_contents.as_bytes())?;
         }
 
-        let mut cmd = Command::new(&clang.path);
+        let mut cmd = Command::new(clang.path);
         cmd.arg("-save-temps")
             .arg("-E")
             .arg("-C")
@@ -2516,22 +2516,21 @@ impl Bindings {
             let path = Path::new(h);
             if let Ok(md) = std::fs::metadata(path) {
                 if md.is_dir() {
-                    return GenerateResult::Err(
-                        BindgenError::FolderAsHeader(path.into()).into(),
-                    );
+                    return GenerateResult::Err(BindgenError::FolderAsHeader(
+                        path.into(),
+                    ));
                 }
                 if !can_read(&md.permissions()) {
                     return GenerateResult::Err(
-                        BindgenError::InsufficientPermissions(path.into())
-                            .into(),
+                        BindgenError::InsufficientPermissions(path.into()),
                     );
                 }
                 let h = h.clone();
                 options.clang_args.push(h);
             } else {
-                return GenerateResult::Err(
-                    BindgenError::NotExist(path.into()).into(),
-                );
+                return GenerateResult::Err(BindgenError::NotExist(
+                    path.into(),
+                ));
             }
         }
 
@@ -2855,11 +2854,10 @@ pub fn clang_version() -> ClangVersion {
 /// Looks for the env var `var_${TARGET}`, and falls back to just `var` when it is not found.
 fn get_target_dependent_env_var(var: &str) -> Option<String> {
     if let Ok(target) = env::var("TARGET") {
-        if let Ok(v) = env::var(&format!("{}_{}", var, target)) {
+        if let Ok(v) = env::var(format!("{}_{}", var, target)) {
             return Some(v);
         }
-        if let Ok(v) =
-            env::var(&format!("{}_{}", var, target.replace('-', "_")))
+        if let Ok(v) = env::var(format!("{}_{}", var, target.replace('-', "_")))
         {
             return Some(v);
         }

Original file line number	Diff line number	Diff line change
`@@ -2076,7 +2076,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"`
`2076`	`2076`	`self.in_codegen_phase(),`
`2077`	`2077`	`"You're not supposed to call this yet"`
`2078`	`2078`	`);`
`2079`		`- self.options.opaque_types.matches(&path[1..].join("::"))`
	`2079`	`+ self.options.opaque_types.matches(path[1..].join("::"))`
`2080`	`2080`	`}`
`2081`	`2081`
`2082`	`2082`	`/// Get the options used to configure this bindgen context.`
`@@ -2314,7 +2314,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"`
`2314`	`2314`	`if self`
`2315`	`2315`	`.options()`
`2316`	`2316`	`.allowlisted_files`
`2317`		`- .matches(&filename)`
	`2317`	`+ .matches(filename)`
`2318`	`2318`	`{`
`2319`	`2319`	`return true;`
`2320`	`2320`	`}`
`@@ -2389,7 +2389,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"`
`2389`	`2389`	`);`
`2390`	`2390`	`let name = prefix_path[1..].join("::");`
`2391`	`2391`	`prefix_path.pop().unwrap();`
`2392`		`- self.options().allowlisted_vars.matches(&name)`
	`2392`	`+ self.options().allowlisted_vars.matches(name)`
`2393`	`2393`	`})`
`2394`	`2394`	`}`
`2395`	`2395`	`}`
`@@ -2671,37 +2671,37 @@ If you encounter an error missing from this list, please file an issue or a PR!"`
`2671`	`2671`	/// Check if `--no-partialeq` flag is enabled for this item.
`2672`	`2672`	`pub fn no_partialeq_by_name(&self, item: &Item) -> bool {`
`2673`	`2673`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2674`		`- self.options().no_partialeq_types.matches(&name)`
	`2674`	`+ self.options().no_partialeq_types.matches(name)`
`2675`	`2675`	`}`
`2676`	`2676`
`2677`	`2677`	/// Check if `--no-copy` flag is enabled for this item.
`2678`	`2678`	`pub fn no_copy_by_name(&self, item: &Item) -> bool {`
`2679`	`2679`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2680`		`- self.options().no_copy_types.matches(&name)`
	`2680`	`+ self.options().no_copy_types.matches(name)`
`2681`	`2681`	`}`
`2682`	`2682`
`2683`	`2683`	/// Check if `--no-debug` flag is enabled for this item.
`2684`	`2684`	`pub fn no_debug_by_name(&self, item: &Item) -> bool {`
`2685`	`2685`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2686`		`- self.options().no_debug_types.matches(&name)`
	`2686`	`+ self.options().no_debug_types.matches(name)`
`2687`	`2687`	`}`
`2688`	`2688`
`2689`	`2689`	/// Check if `--no-default` flag is enabled for this item.
`2690`	`2690`	`pub fn no_default_by_name(&self, item: &Item) -> bool {`
`2691`	`2691`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2692`		`- self.options().no_default_types.matches(&name)`
	`2692`	`+ self.options().no_default_types.matches(name)`
`2693`	`2693`	`}`
`2694`	`2694`
`2695`	`2695`	/// Check if `--no-hash` flag is enabled for this item.
`2696`	`2696`	`pub fn no_hash_by_name(&self, item: &Item) -> bool {`
`2697`	`2697`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2698`		`- self.options().no_hash_types.matches(&name)`
	`2698`	`+ self.options().no_hash_types.matches(name)`
`2699`	`2699`	`}`
`2700`	`2700`
`2701`	`2701`	/// Check if `--must-use-type` flag is enabled for this item.
`2702`	`2702`	`pub fn must_use_type_by_name(&self, item: &Item) -> bool {`
`2703`	`2703`	`let name = item.path_for_allowlisting(self)[1..].join("::");`
`2704`		`- self.options().must_use_types.matches(&name)`
	`2704`	`+ self.options().must_use_types.matches(name)`
`2705`	`2705`	`}`
`2706`	`2706`	`}`
`2707`	`2707`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ impl Enum {`
`156`	`156`	`let path = item.path_for_allowlisting(ctx);`
`157`	`157`	`let enum_ty = item.expect_type();`
`158`	`158`
`159`		`- if enums.matches(&path[1..].join("::")) {`
	`159`	`+ if enums.matches(path[1..].join("::")) {`
`160`	`160`	`return true;`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ impl Item {`
`650`	`650`	`if let Some(location) = &self.location {`
`651`	`651`	`let (file, _, _, _) = location.location();`
`652`	`652`	`if let Some(filename) = file.name() {`
`653`		`- if ctx.options().blocklisted_files.matches(&filename) {`
	`653`	`+ if ctx.options().blocklisted_files.matches(filename) {`
`654`	`654`	`return true;`
`655`	`655`	`}`
`656`	`656`	`}`