Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 16 deletions

diff --git a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed b/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed
deleted file mode 100644
index 39e90d7a3..000000000
--- a/src/test/ui/trait-bounds/shadowed-path-in-trait-bound-suggestion.fixed
+++ /dev/null
@@ -1,16 +0,0 @@
-// run-rustfix
-#![allow(non_snake_case)]
-mod A {
-    pub trait Trait {}
-    impl Trait for i32 {}
-}
-
-mod B {
-    use A::Trait;
-
-pub struct A<H: Trait>(pub H); //~ ERROR cannot find trait
-}
-
-fn main() {
-    let _ = B::A(42);
-}