Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 136 deletions

diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr
deleted file mode 100644
index 079230b2a..000000000
--- a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr
+++ /dev/null
@@ -1,136 +0,0 @@
-error: multiple `deprecated` attributes
-  --> $DIR/stability-attribute-sanity.rs:62:1
-   |
-LL | #[deprecated(since = "b", note = "text")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
-   |
-note: attribute also specified here
-  --> $DIR/stability-attribute-sanity.rs:61:1
-   |
-LL | #[deprecated(since = "b", note = "text")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0541]: unknown meta item 'reason'
-  --> $DIR/stability-attribute-sanity.rs:8:42
-   |
-LL |     #[stable(feature = "a", since = "b", reason)]
-   |                                          ^^^^^^ expected one of `feature`, `since`
-
-error[E0539]: incorrect meta item
-  --> $DIR/stability-attribute-sanity.rs:11:29
-   |
-LL |     #[stable(feature = "a", since)]
-   |                             ^^^^^
-
-error[E0539]: incorrect meta item
-  --> $DIR/stability-attribute-sanity.rs:14:14
-   |
-LL |     #[stable(feature, since = "a")]
-   |              ^^^^^^^
-
-error[E0539]: incorrect meta item
-  --> $DIR/stability-attribute-sanity.rs:17:29
-   |
-LL |     #[stable(feature = "a", since(b))]
-   |                             ^^^^^^^^
-
-error[E0539]: incorrect meta item
-  --> $DIR/stability-attribute-sanity.rs:20:14
-   |
-LL |     #[stable(feature(b), since = "a")]
-   |              ^^^^^^^^^^
-
-error[E0546]: missing 'feature'
-  --> $DIR/stability-attribute-sanity.rs:25:5
-   |
-LL |     #[unstable(issue = "none")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0547]: missing 'issue'
-  --> $DIR/stability-attribute-sanity.rs:28:5
-   |
-LL |     #[unstable(feature = "b")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0546]: missing 'feature'
-  --> $DIR/stability-attribute-sanity.rs:31:5
-   |
-LL |     #[stable(since = "a")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0542]: missing 'since'
-  --> $DIR/stability-attribute-sanity.rs:36:5
-   |
-LL |     #[stable(feature = "a")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0542]: missing 'since'
-  --> $DIR/stability-attribute-sanity.rs:40:5
-   |
-LL |     #[deprecated(note = "a")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0543]: missing 'note'
-  --> $DIR/stability-attribute-sanity.rs:44:5
-   |
-LL |     #[deprecated(since = "a")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0544]: multiple stability levels
-  --> $DIR/stability-attribute-sanity.rs:49:1
-   |
-LL | #[stable(feature = "a", since = "b")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0544]: multiple stability levels
-  --> $DIR/stability-attribute-sanity.rs:53:1
-   |
-LL | #[unstable(feature = "b", issue = "none")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0544]: multiple stability levels
-  --> $DIR/stability-attribute-sanity.rs:57:1
-   |
-LL | #[stable(feature = "a", since = "b")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0544]: multiple stability levels
-  --> $DIR/stability-attribute-sanity.rs:64:1
-   |
-LL | #[rustc_const_unstable(feature = "d", issue = "none")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: invalid stability version found
-  --> $DIR/stability-attribute-sanity.rs:60:1
-   |
-LL | #[stable(feature = "a", since = "b")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid stability version
-...
-LL | pub const fn multiple4() { }
-   | ---------------------------- the stability attribute annotates this item
-
-error: invalid deprecation version found
-  --> $DIR/stability-attribute-sanity.rs:67:1
-   |
-LL | #[stable(feature = "a", since = "1.0.0")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid deprecation version
-...
-LL | fn invalid_deprecation_version() {}
-   | ----------------------------------- the stability attribute annotates this item
-
-error[E0549]: deprecated attribute must be paired with either stable or unstable attribute
-  --> $DIR/stability-attribute-sanity.rs:72:1
-   |
-LL | #[deprecated(since = "a", note = "text")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0711]: feature `a` is declared stable since 1.0.0, but was previously declared stable since b
-  --> $DIR/stability-attribute-sanity.rs:67:1
-   |
-LL | #[stable(feature = "a", since = "1.0.0")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 20 previous errors
-
-Some errors have detailed explanations: E0539, E0541, E0542, E0543, E0544, E0546, E0547, E0549.
-For more information about an error, try `rustc --explain E0539`.