From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:03 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/phantom-auto-trait.stderr | 66 -----------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 src/test/ui/phantom-auto-trait.stderr

(limited to 'src/test/ui/phantom-auto-trait.stderr')

diff --git a/src/test/ui/phantom-auto-trait.stderr b/src/test/ui/phantom-auto-trait.stderr
deleted file mode 100644
index 015c8fa4c..000000000
--- a/src/test/ui/phantom-auto-trait.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-error[E0277]: `T` cannot be shared between threads safely
-  --> $DIR/phantom-auto-trait.rs:21:12
-   |
-LL |     is_zen(x)
-   |     ------ ^ `T` cannot be shared between threads safely
-   |     |
-   |     required by a bound introduced by this call
-   |
-note: required for `&T` to implement `Zen`
-  --> $DIR/phantom-auto-trait.rs:10:24
-   |
-LL | unsafe impl<'a, T: 'a> Zen for &'a T where T: Sync {}
-   |                        ^^^     ^^^^^
-   = note: required because it appears within the type `PhantomData<&T>`
-note: required because it appears within the type `Guard<'_, T>`
-  --> $DIR/phantom-auto-trait.rs:12:8
-   |
-LL | struct Guard<'a, T: 'a> {
-   |        ^^^^^
-note: required by a bound in `is_zen`
-  --> $DIR/phantom-auto-trait.rs:18:14
-   |
-LL | fn is_zen<T: Zen>(_: T) {}
-   |              ^^^ required by this bound in `is_zen`
-help: consider restricting type parameter `T`
-   |
-LL | fn not_sync<T: std::marker::Sync>(x: Guard<T>) {
-   |              +++++++++++++++++++
-
-error[E0277]: `T` cannot be shared between threads safely
-  --> $DIR/phantom-auto-trait.rs:26:12
-   |
-LL |     is_zen(x)
-   |     ------ ^ `T` cannot be shared between threads safely
-   |     |
-   |     required by a bound introduced by this call
-   |
-note: required for `&T` to implement `Zen`
-  --> $DIR/phantom-auto-trait.rs:10:24
-   |
-LL | unsafe impl<'a, T: 'a> Zen for &'a T where T: Sync {}
-   |                        ^^^     ^^^^^
-   = note: required because it appears within the type `PhantomData<&T>`
-note: required because it appears within the type `Guard<'_, T>`
-  --> $DIR/phantom-auto-trait.rs:12:8
-   |
-LL | struct Guard<'a, T: 'a> {
-   |        ^^^^^
-note: required because it appears within the type `Nested<Guard<'_, T>>`
-  --> $DIR/phantom-auto-trait.rs:16:8
-   |
-LL | struct Nested<T>(T);
-   |        ^^^^^^
-note: required by a bound in `is_zen`
-  --> $DIR/phantom-auto-trait.rs:18:14
-   |
-LL | fn is_zen<T: Zen>(_: T) {}
-   |              ^^^ required by this bound in `is_zen`
-help: consider restricting type parameter `T`
-   |
-LL | fn nested_not_sync<T: std::marker::Sync>(x: Nested<Guard<T>>) {
-   |                     +++++++++++++++++++
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0277`.
-- 
cgit v1.2.3