Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/imports/issue-52891.fixed b/src/test/ui/imports/issue-52891.fixed
deleted file mode 100644
index e694b5c9b..000000000
--- a/src/test/ui/imports/issue-52891.fixed
+++ /dev/null
@@ -1,37 +0,0 @@
-// aux-build:issue-52891.rs
-// run-rustfix
-
-#![allow(warnings)]
-
-extern crate issue_52891;
-
-// Check that we don't suggest renaming duplicate imports but instead
-// suggest removing one.
-
-use issue_52891::a;
- //~ ERROR `a` is defined multiple times
-
-use issue_52891::{b, c}; //~ ERROR `a` is defined multiple times
-use issue_52891::{d, e}; //~ ERROR `a` is defined multiple times
-use issue_52891::{f, g}; //~ ERROR `a` is defined multiple times
-
-use issue_52891::{//~ ERROR `a` is defined multiple times
-    h,
-    i};
-use issue_52891::{j,
-    //~ ERROR `a` is defined multiple times
-    k};
-use issue_52891::{l,
-    m}; //~ ERROR `a` is defined multiple times
-
-use issue_52891::a::inner;
-use issue_52891::b::inner as other_inner; //~ ERROR `inner` is defined multiple times
-
-
-//~^ ERROR `issue_52891` is defined multiple times
-
-
-#[macro_use]
-use issue_52891::n; //~ ERROR `n` is defined multiple times
-
-fn main() {}