0.21.0: fix backwards compatible cargo +stable clippy -p c2rust warnings

Author: kkysen

c2rust-ast-builder/src/builder.rs

@@ -212,14 +212,14 @@ impl<L: Make<Ident>> Make<Label> for L {
     }
 }
 
-impl<'a> Make<Path> for &'a str {
+impl Make<Path> for &str {
     fn make(self, mk: &Builder) -> Path {
         let v = vec![self];
         Make::<Path>::make(v, mk)
     }
 }
 
-impl<'a> Make<Abi> for &'a str {
+impl Make<Abi> for &str {
     fn make(self, mk: &Builder) -> Abi {
         Abi {
             extern_token: Token![extern](mk.span),
@@ -229,7 +229,7 @@ impl<'a> Make<Abi> for &'a str {
     }
 }
 
-impl<'a> Make<Extern> for &'a str {
+impl Make<Extern> for &str {
     fn make(self, _mk: &Builder) -> Extern {
         Extern::Explicit(self.to_owned())
     }

c2rust-transpile/src/c_ast/mod.rs

@@ -299,11 +299,11 @@ impl TypedAstContext {
         }
     }
 
-    pub fn iter_decls(&self) -> indexmap::map::Iter<CDeclId, CDecl> {
+    pub fn iter_decls(&self) -> indexmap::map::Iter<'_, CDeclId, CDecl> {
         self.c_decls.iter()
     }
 
-    pub fn iter_mut_decls(&mut self) -> indexmap::map::IterMut<CDeclId, CDecl> {
+    pub fn iter_mut_decls(&mut self) -> indexmap::map::IterMut<'_, CDeclId, CDecl> {
         self.c_decls.iter_mut()
     }
 

c2rust-transpile/src/translator/mod.rs

@@ -519,7 +519,7 @@ pub fn translate(
             None,
         }
 
-        fn some_type_name(s: Option<&str>) -> Name {
+        fn some_type_name(s: Option<&str>) -> Name<'_> {
             match s {
                 None => Name::Anonymous,
                 Some(r) => Name::Type(r),
@@ -5152,9 +5152,7 @@ impl<'c> Translation<'c> {
         // If the definition lives in the same header, there is no need to import it
         // in fact, this would be a hard rust error.
         // We should never import into the main module here, as that happens in make_submodule
-        if import_file_id.map_or(false, |path| path == decl_file_id)
-            || decl_file_id == self.main_file
-        {
+        if import_file_id == Some(decl_file_id) || decl_file_id == self.main_file {
             return;
         }