transpile: some minor cleanups from #1452

Author: kkysen

c2rust-transpile/src/rust_ast/item_store.rs

@@ -3,6 +3,7 @@ use indexmap::{IndexMap, IndexSet};
 use syn::{ForeignItem, Ident, Item};
 
 use std::borrow::Cow;
+use std::collections::HashSet;
 use std::mem::swap;
 
 #[derive(Debug)]
@@ -79,19 +80,14 @@ impl PathedMultiImports {
             .collect()
     }
 
-    /// Remove all imports covered by the other `PathedMultiImports`.
+    /// Remove all imports covered by the other [`PathedMultiImports`].
     pub fn remove(&mut self, other: &PathedMultiImports) {
         for (k, v) in &mut self.0 {
             // We don't consider attributes, just subtract leaf sets.
             let other_items = other
                 .0
                 .get(k)
-                .map(|imports| {
-                    imports
-                        .leaves
-                        .iter()
-                        .collect::<std::collections::HashSet<_>>()
-                })
+                .map(|imports| imports.leaves.iter().collect::<HashSet<_>>())
                 .unwrap_or_default();
             v.leaves.retain(|leaf| !other_items.contains(leaf));
         }

c2rust-transpile/src/translator/mod.rs

@@ -664,7 +664,7 @@ pub fn translate(
                 if t.tcfg.reorganize_definitions
                     && decl_file_id.map_or(false, |id| id != t.main_file)
                 {
-                    let name: Option<&String> = t
+                    let name = t
                         .ast_context
                         .get_decl(&decl_id)
                         .and_then(|x| x.kind.get_name());
@@ -941,12 +941,13 @@ impl<'a> IdentsOrGlob<'a> {
 
 /// Extract the set of names made visible by a `use`.
 fn use_idents<'a>(i: &'a UseTree) -> IdentsOrGlob<'a> {
+    use UseTree::*;
     match i {
-        UseTree::Path(up) => use_idents(&up.tree),
-        UseTree::Name(un) => IdentsOrGlob::Idents(vec![&un.ident]),
-        UseTree::Rename(ur) => IdentsOrGlob::Idents(vec![&ur.rename]),
-        UseTree::Glob(_ugl) => IdentsOrGlob::Glob,
-        UseTree::Group(ugr) => ugr
+        Path(up) => use_idents(&up.tree),
+        Name(un) => IdentsOrGlob::Idents(vec![&un.ident]),
+        Rename(ur) => IdentsOrGlob::Idents(vec![&ur.rename]),
+        Glob(_ugl) => IdentsOrGlob::Glob,
+        Group(ugr) => ugr
             .items
             .iter()
             .map(|tree| use_idents(tree))
@@ -1078,37 +1079,38 @@ fn make_submodule(
 
     // Consumers will `use` reexported items at their exported locations.
     for item in uses.into_items() {
-        if let Item::Use(ItemUse {
-            vis: Visibility::Public(_),
-            tree,
-            ..
-        }) = &*item
-        {
-            match use_idents(tree) {
-                IdentsOrGlob::Idents(idents) => {
-                    for ident in idents {
-                        fn is_simd_type_name(name: &str) -> bool {
-                            const SIMD_TYPE_NAMES: &[&str] = &[
-                                "__m128i", "__m128", "__m128d", "__m64", "__m256", "__m256d",
-                                "__m256i",
-                            ];
-                            SIMD_TYPE_NAMES.contains(&name) || name.starts_with("_mm_")
-                        }
-                        let name = &*ident.to_string();
-                        if is_simd_type_name(name) {
-                            // Import vector type/operation names from the stdlib, as we also generate
-                            // other uses for them from that location and can't easily reason about
-                            // the ultimate target of reexported names when avoiding duplicate imports
-                            // (which are verboten).
-                            simd::add_arch_use(use_item_store, "x86", name);
-                            simd::add_arch_use(use_item_store, "x86_64", name);
-                        } else {
-                            // Add a `use` for `self::this_module::exported_name`.
-                            use_item_store.add_use(false, use_path(), name);
-                        }
-                    }
-                }
-                IdentsOrGlob::Glob => {}
+        let tree = match &*item {
+            Item::Use(ItemUse {
+                vis: Visibility::Public(_),
+                tree,
+                ..
+            }) => tree,
+            _ => continue,
+        };
+        let idents = match use_idents(tree) {
+            IdentsOrGlob::Idents(idents) => idents,
+            IdentsOrGlob::Glob => continue,
+        };
+
+        fn is_simd_type_name(name: &str) -> bool {
+            const SIMD_TYPE_NAMES: &[&str] = &[
+                "__m128i", "__m128", "__m128d", "__m64", "__m256", "__m256d", "__m256i",
+            ];
+            SIMD_TYPE_NAMES.contains(&name) || name.starts_with("_mm_")
+        }
+
+        for ident in idents {
+            let name = &*ident.to_string();
+            if is_simd_type_name(name) {
+                // Import vector type/operation names from the stdlib, as we also generate
+                // other uses for them from that location and can't easily reason about
+                // the ultimate target of reexported names when avoiding duplicate imports
+                // (which are verboten).
+                simd::add_arch_use(use_item_store, "x86", name);
+                simd::add_arch_use(use_item_store, "x86_64", name);
+            } else {
+                // Add a `use` for `self::this_module::exported_name`.
+                use_item_store.add_use(false, use_path(), name);
             }
         }
         items.push(item);

tests/items/src/test_fn_attrs.rs

@@ -8,7 +8,7 @@ pub fn test_fn_attrs() {
 
     // Remove the c2rust::src_loc annotation, which is only produced if
     // --reorganize-definitions is enabled.
-    let mut lines: Vec<&str> = src.lines().collect();
+    let mut lines = src.lines().collect::<Vec<_>>();
     lines.retain(|x| !x.contains("#[c2rust::src_loc"));
     let src = lines.join("\n");
 

tests/statics/src/test_sections.rs

@@ -36,7 +36,7 @@ pub fn test_sectioned_used_static() {
         // directly at the source file
         let src = include_str!("attributes.rs");
 
-        let mut lines: Vec<&str> = src.lines().collect();
+        let mut lines = src.lines().collect::<Vec<_>>();
 
         // Remove the c2rust::src_loc annotation, which is only produced if
         // --reorganize-definitions is enabled.