Dedup imports_granularity = "Item" (#4737)

* Fix for issue 4725 - dedup Item imports_granularity (2nd version) * Use unique() instead of unique_by()
rust-lang · Mar 16, 2021 · 6b415bd · 6b415bd
1 parent 0e90855
commit 6b415bd
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 1 deletion.
diff --git a/src/formatting/imports.rs b/src/formatting/imports.rs
@@ -2,6 +2,10 @@ use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::fmt;
 
+use core::hash::{Hash, Hasher};
+
+use itertools::Itertools;
+
 use rustc_ast::ast::{self, UseTreeKind};
 use rustc_span::{
     symbol::{self, sym},
@@ -87,7 +91,7 @@ impl<'a> FmtVisitor<'a> {
 // sorting.
 
 // FIXME we do a lot of allocation to make our own representation.
-#[derive(Clone, Eq, PartialEq)]
+#[derive(Clone, Eq, Hash, PartialEq)]
 pub(crate) enum UseSegment {
     Ident(String, Option<String>),
     Slf(Option<String>),
@@ -195,6 +199,8 @@ pub(crate) fn merge_use_trees(use_trees: Vec<UseTree>, merge_by: SharedPrefix) -
 }
 
 pub(crate) fn flatten_use_trees(use_trees: Vec<UseTree>) -> Vec<UseTree> {
+    // Return non-sorted single occurance of the use-trees text string;
+    // order is by first occurance of the use-tree.
     use_trees
         .into_iter()
         .flat_map(UseTree::flatten)
@@ -209,6 +215,7 @@ pub(crate) fn flatten_use_trees(use_trees: Vec<UseTree>) -> Vec<UseTree> {
             }
             tree
         })
+        .unique()
         .collect()
 }
 
@@ -685,6 +692,12 @@ fn merge_use_trees_inner(trees: &mut Vec<UseTree>, use_tree: UseTree, merge_by:
     trees.sort();
 }
 
+impl Hash for UseTree {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.path.hash(state);
+    }
+}
+
 impl PartialOrd for UseSegment {
     fn partial_cmp(&self, other: &UseSegment) -> Option<Ordering> {
         Some(self.cmp(other))

diff --git a/tests/source/imports-impl-only-use.rs → ...s/source/imports/imports-impl-only-use.rs b/tests/source/imports-impl-only-use.rs → ...s/source/imports/imports-impl-only-use.rs
diff --git a/...source/imports-reorder-lines-and-items.rs → ...mports/imports-reorder-lines-and-items.rs b/...source/imports-reorder-lines-and-items.rs → ...mports/imports-reorder-lines-and-items.rs
diff --git a/tests/source/imports-reorder-lines.rs → ...s/source/imports/imports-reorder-lines.rs b/tests/source/imports-reorder-lines.rs → ...s/source/imports/imports-reorder-lines.rs
diff --git a/tests/source/imports-reorder.rs → tests/source/imports/imports-reorder.rs b/tests/source/imports-reorder.rs → tests/source/imports/imports-reorder.rs
diff --git a/tests/source/imports.rs → tests/source/imports/imports.rs b/tests/source/imports.rs → tests/source/imports/imports.rs
diff --git a/tests/source/imports_2015_edition.rs → tests/source/imports/imports_2015_edition.rs b/tests/source/imports_2015_edition.rs → tests/source/imports/imports_2015_edition.rs
diff --git a/tests/source/imports_block_indent.rs → tests/source/imports/imports_block_indent.rs b/tests/source/imports_block_indent.rs → tests/source/imports/imports_block_indent.rs
diff --git a/tests/source/imports_granularity_crate.rs → ...urce/imports/imports_granularity_crate.rs b/tests/source/imports_granularity_crate.rs → ...urce/imports/imports_granularity_crate.rs
diff --git a/tests/source/imports/imports_granularity_default-with-dups.rs b/tests/source/imports/imports_granularity_default-with-dups.rs
@@ -0,0 +1,6 @@
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{tokens::TokenData};
+use crate::lexer::self;
+use crate::lexer::{self};
+use crate::lexer::{self, tokens::TokenData};
diff --git a/tests/source/imports/imports_granularity_item-with-dups-StdExternalCrate-no-reorder.rs b/tests/source/imports/imports_granularity_item-with-dups-StdExternalCrate-no-reorder.rs
@@ -0,0 +1,13 @@
+// rustfmt-imports_granularity: Item
+// rustfmt-reorder_imports: false
+// rustfmt-group_imports: StdExternalCrate
+
+use crate::lexer;
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{tokens::TokenData};
+use crate::lexer::self;
+use crate::lexer;
+use crate::lexer;
+use crate::lexer::{self};
+use crate::lexer::{self, tokens::TokenData};
diff --git a/tests/source/imports/imports_granularity_item-with-dups.rs b/tests/source/imports/imports_granularity_item-with-dups.rs
@@ -0,0 +1,11 @@
+// rustfmt-imports_granularity: Item
+
+use crate::lexer;
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{tokens::TokenData};
+use crate::lexer::self;
+use crate::lexer;
+use crate::lexer;
+use crate::lexer::{self};
+use crate::lexer::{self, tokens::TokenData};
diff --git a/tests/source/imports_granularity_item.rs → ...ource/imports/imports_granularity_item.rs b/tests/source/imports_granularity_item.rs → ...ource/imports/imports_granularity_item.rs
diff --git a/tests/source/imports_granularity_module.rs → ...rce/imports/imports_granularity_module.rs b/tests/source/imports_granularity_module.rs → ...rce/imports/imports_granularity_module.rs
diff --git a/tests/source/imports_raw_identifiers.rs → ...source/imports/imports_raw_identifiers.rs b/tests/source/imports_raw_identifiers.rs → ...source/imports/imports_raw_identifiers.rs
diff --git a/tests/target/import-fencepost-length.rs → ...target/imports/import-fencepost-length.rs b/tests/target/import-fencepost-length.rs → ...target/imports/import-fencepost-length.rs
diff --git a/tests/target/imports-impl-only-use.rs → ...s/target/imports/imports-impl-only-use.rs b/tests/target/imports-impl-only-use.rs → ...s/target/imports/imports-impl-only-use.rs
diff --git a/...target/imports-reorder-lines-and-items.rs → ...mports/imports-reorder-lines-and-items.rs b/...target/imports-reorder-lines-and-items.rs → ...mports/imports-reorder-lines-and-items.rs
diff --git a/tests/target/imports-reorder-lines.rs → ...s/target/imports/imports-reorder-lines.rs b/tests/target/imports-reorder-lines.rs → ...s/target/imports/imports-reorder-lines.rs
diff --git a/tests/target/imports-reorder.rs → tests/target/imports/imports-reorder.rs b/tests/target/imports-reorder.rs → tests/target/imports/imports-reorder.rs
diff --git a/tests/target/imports.rs → tests/target/imports/imports.rs b/tests/target/imports.rs → tests/target/imports/imports.rs
diff --git a/tests/target/imports_2015_edition.rs → tests/target/imports/imports_2015_edition.rs b/tests/target/imports_2015_edition.rs → tests/target/imports/imports_2015_edition.rs
diff --git a/tests/target/imports_2021_edition.rs → tests/target/imports/imports_2021_edition.rs b/tests/target/imports_2021_edition.rs → tests/target/imports/imports_2021_edition.rs
diff --git a/tests/target/imports_block_indent.rs → tests/target/imports/imports_block_indent.rs b/tests/target/imports_block_indent.rs → tests/target/imports/imports_block_indent.rs
diff --git a/tests/target/imports_granularity_crate.rs → ...rget/imports/imports_granularity_crate.rs b/tests/target/imports_granularity_crate.rs → ...rget/imports/imports_granularity_crate.rs
diff --git a/tests/target/imports/imports_granularity_default-with-dups.rs b/tests/target/imports/imports_granularity_default-with-dups.rs
@@ -0,0 +1,6 @@
+use crate::lexer;
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{self};
+use crate::lexer::{self, tokens::TokenData};
diff --git a/tests/target/imports/imports_granularity_item-with-dups-StdExternalCrate-no-reorder.rs b/tests/target/imports/imports_granularity_item-with-dups-StdExternalCrate-no-reorder.rs
@@ -0,0 +1,7 @@
+// rustfmt-imports_granularity: Item
+// rustfmt-reorder_imports: false
+// rustfmt-group_imports: StdExternalCrate
+
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{self};
diff --git a/tests/target/imports/imports_granularity_item-with-dups.rs b/tests/target/imports/imports_granularity_item-with-dups.rs
@@ -0,0 +1,5 @@
+// rustfmt-imports_granularity: Item
+
+use crate::lexer;
+use crate::lexer::tokens::TokenData;
+use crate::lexer::{self};
diff --git a/tests/target/imports_granularity_item.rs → ...arget/imports/imports_granularity_item.rs b/tests/target/imports_granularity_item.rs → ...arget/imports/imports_granularity_item.rs
diff --git a/tests/target/imports_granularity_module.rs → ...get/imports/imports_granularity_module.rs b/tests/target/imports_granularity_module.rs → ...get/imports/imports_granularity_module.rs
diff --git a/tests/target/imports_raw_identifiers.rs → ...target/imports/imports_raw_identifiers.rs b/tests/target/imports_raw_identifiers.rs → ...target/imports/imports_raw_identifiers.rs