New upstream version 1.48.0~beta.8+dfsg1

[rustc.git] / src / test / ui / phantom-oibit.stderr

diff --git a/src/test/ui/phantom-oibit.stderr b/src/test/ui/phantom-oibit.stderr
index e143747d637ee0292c2ee79aed7ba4e340f73c61..8a02f23da94200ab1c6d5a3da3dedcebeb7a612c 100644 (file)
--- a/src/test/ui/phantom-oibit.stderr
+++ b/src/test/ui/phantom-oibit.stderr
@@ -8,12 +8,12 @@ LL |     is_zen(x)
    |            ^ `T` cannot be shared between threads safely
    |
    = note: required because of the requirements on the impl of `Zen` for `&T`
-   = note: required because it appears within the type `std::marker::PhantomData<&T>`
+   = note: required because it appears within the type `PhantomData<&T>`
    = note: required because it appears within the type `Guard<'_, T>`
 help: consider restricting type parameter `T`
    |
-LL | fn not_sync<T: std::marker::Sync>(x: Guard<T>) {
-   |              ^^^^^^^^^^^^^^^^^^^
+LL | fn not_sync<T: Sync>(x: Guard<T>) {
+   |              ^^^^^^
 
 error[E0277]: `T` cannot be shared between threads safely
   --> $DIR/phantom-oibit.rs:26:12
@@ -25,13 +25,13 @@ LL |     is_zen(x)
    |            ^ `T` cannot be shared between threads safely
    |
    = note: required because of the requirements on the impl of `Zen` for `&T`
-   = note: required because it appears within the type `std::marker::PhantomData<&T>`
+   = note: required because it appears within the type `PhantomData<&T>`
    = note: required because it appears within the type `Guard<'_, T>`
    = note: required because it appears within the type `Nested<Guard<'_, T>>`
 help: consider restricting type parameter `T`
    |
-LL | fn nested_not_sync<T: std::marker::Sync>(x: Nested<Guard<T>>) {
-   |                     ^^^^^^^^^^^^^^^^^^^
+LL | fn nested_not_sync<T: Sync>(x: Nested<Guard<T>>) {
+   |                     ^^^^^^
 
 error: aborting due to 2 previous errors