Fix tests from rebase

8 files changed, 15 insertions, 31 deletions

diff --git a/src/test/ui/traits/check-trait-object-bounds-1.rs b/src/test/ui/traits/check-trait-object-bounds-1.rs
index ad908a750b4..b1f124c7ea2 100644
--- a/src/test/ui/traits/check-trait-object-bounds-1.rs
+++ b/src/test/ui/traits/check-trait-object-bounds-1.rs
@@ -10,5 +10,5 @@ fn f<T: X + ?Sized>() {
 
 fn main() {
     f::<dyn X<Y = str>>();
-    //~^ ERROR the trait bound `str: std::clone::Clone` is not satisfied
+    //~^ ERROR the trait bound `str: Clone` is not satisfied
 }
diff --git a/src/test/ui/traits/check-trait-object-bounds-1.stderr b/src/test/ui/traits/check-trait-object-bounds-1.stderr
index c53c91d42a7..170ed6eacfd 100644
--- a/src/test/ui/traits/check-trait-object-bounds-1.stderr
+++ b/src/test/ui/traits/check-trait-object-bounds-1.stderr
@@ -1,11 +1,11 @@
-error[E0277]: the trait bound `str: std::clone::Clone` is not satisfied
+error[E0277]: the trait bound `str: Clone` is not satisfied
   --> $DIR/check-trait-object-bounds-1.rs:12:5
    |
 LL | fn f<T: X + ?Sized>() {
    |         - required by this bound in `f`
 ...
 LL |     f::<dyn X<Y = str>>();
-   |     ^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `str`
+   |     ^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `str`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/check-trait-object-bounds-2.rs b/src/test/ui/traits/check-trait-object-bounds-2.rs
index f825008c6a2..eb2fb6e841b 100644
--- a/src/test/ui/traits/check-trait-object-bounds-2.rs
+++ b/src/test/ui/traits/check-trait-object-bounds-2.rs
@@ -11,5 +11,5 @@ fn f<T: for<'r> X<'r> + ?Sized>() {
 
 fn main() {
     f::<dyn for<'x> X<'x, F = i32>>();
-    //~^ expected a `std::ops::FnOnce<(&i32,)>` closure, found `i32`
+    //~^ expected a `FnOnce<(&i32,)>` closure, found `i32`
 }
diff --git a/src/test/ui/traits/check-trait-object-bounds-2.stderr b/src/test/ui/traits/check-trait-object-bounds-2.stderr
index 1241fc8cb51..04e2348634e 100644
--- a/src/test/ui/traits/check-trait-object-bounds-2.stderr
+++ b/src/test/ui/traits/check-trait-object-bounds-2.stderr
@@ -1,4 +1,4 @@
-error[E0277]: expected a `std::ops::FnOnce<(&i32,)>` closure, found `i32`
+error[E0277]: expected a `FnOnce<(&i32,)>` closure, found `i32`
   --> $DIR/check-trait-object-bounds-2.rs:13:5
    |
 LL | fn f<T: for<'r> X<'r> + ?Sized>() {
@@ -7,7 +7,7 @@ LL | fn f<T: for<'r> X<'r> + ?Sized>() {
 LL |     f::<dyn for<'x> X<'x, F = i32>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected an `FnOnce<(&i32,)>` closure, found `i32`
    |
-   = help: the trait `for<'r> std::ops::FnOnce<(&'r i32,)>` is not implemented for `i32`
+   = help: the trait `for<'r> FnOnce<(&'r i32,)>` is not implemented for `i32`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/check-trait-object-bounds-4.rs b/src/test/ui/traits/check-trait-object-bounds-4.rs
index 323508db2f2..e9ca1563f3b 100644
--- a/src/test/ui/traits/check-trait-object-bounds-4.rs
+++ b/src/test/ui/traits/check-trait-object-bounds-4.rs
@@ -13,5 +13,5 @@ fn f<T: X + ?Sized>() {
 
 fn main() {
     f::<dyn X<Y = str>>();
-    //~^ ERROR the trait bound `str: std::clone::Clone` is not satisfied
+    //~^ ERROR the trait bound `str: Clone` is not satisfied
 }
diff --git a/src/test/ui/traits/check-trait-object-bounds-4.stderr b/src/test/ui/traits/check-trait-object-bounds-4.stderr
index 75d6862579d..fc9f31c5ebc 100644
--- a/src/test/ui/traits/check-trait-object-bounds-4.stderr
+++ b/src/test/ui/traits/check-trait-object-bounds-4.stderr
@@ -1,11 +1,11 @@
-error[E0277]: the trait bound `str: std::clone::Clone` is not satisfied
+error[E0277]: the trait bound `str: Clone` is not satisfied
   --> $DIR/check-trait-object-bounds-4.rs:15:5
    |
 LL | fn f<T: X + ?Sized>() {
    |         - required by this bound in `f`
 ...
 LL |     f::<dyn X<Y = str>>();
-   |     ^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `str`
+   |     ^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `str`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/cycle-cache-err-60010.stderr b/src/test/ui/traits/cycle-cache-err-60010.stderr
index 738b052a11e..b2702d977f8 100644
--- a/src/test/ui/traits/cycle-cache-err-60010.stderr
+++ b/src/test/ui/traits/cycle-cache-err-60010.stderr
@@ -1,4 +1,4 @@
-error[E0275]: overflow evaluating the requirement `SalsaStorage: std::panic::RefUnwindSafe`
+error[E0275]: overflow evaluating the requirement `SalsaStorage: RefUnwindSafe`
   --> $DIR/cycle-cache-err-60010.rs:69:5
    |
 LL |     fn parse(&self) {
@@ -8,28 +8,12 @@ LL |     SourceDatabase::parse(db);
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: required because it appears within the type `*const SalsaStorage`
-   = note: required because it appears within the type `std::ptr::Unique<SalsaStorage>`
-   = note: required because it appears within the type `std::boxed::Box<SalsaStorage>`
+   = note: required because it appears within the type `Unique<SalsaStorage>`
+   = note: required because it appears within the type `Box<SalsaStorage>`
    = note: required because it appears within the type `Runtime<RootDatabase>`
    = note: required because it appears within the type `RootDatabase`
    = note: required because of the requirements on the impl of `SourceDatabase` for `RootDatabase`
 
-error[E0275]: overflow evaluating the requirement `Runtime<RootDatabase>: RefUnwindSafe`
-  --> $DIR/cycle-cache-err-60010.rs:31:20
-   |
-LL | trait Database {
-   |       -------- required by a bound in this
-LL |     type Storage;
-   |     ------------- required by this bound in `Database`
-...
-LL |     type Storage = SalsaStorage;
-   |                    ^^^^^^^^^^^^
-   |
-   = note: required because it appears within the type `RootDatabase`
-   = note: required because of the requirements on the impl of `SourceDatabase` for `RootDatabase`
-   = note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery`
-   = note: required because it appears within the type `SalsaStorage`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr b/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr
index dbe0146cafa..996544ae516 100644
--- a/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr
+++ b/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr
@@ -9,8 +9,8 @@ LL |     type X = Self;
    |
 help: consider further restricting this bound
    |
-LL | impl<T: Magic + std::marker::Sync> Magic for T {
-   |               ^^^^^^^^^^^^^^^^^^^
+LL | impl<T: Magic + Sync> Magic for T {
+   |               ^^^^^^
 
 error[E0275]: overflow evaluating the requirement `*mut (): Magic`
   --> $DIR/traits-inductive-overflow-two-traits.rs:20:5