Merging upstream version 1.68.2+dfsg1.

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

10 files changed, 0 insertions, 165 deletions

diff --git a/src/test/ui/expr/if/attrs/bad-cfg.rs b/src/test/ui/expr/if/attrs/bad-cfg.rs
deleted file mode 100644
index 3f84929a0..000000000
--- a/src/test/ui/expr/if/attrs/bad-cfg.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![feature(stmt_expr_attributes)]
-
-fn main() {
-    let _ = #[cfg(FALSE)] if true {}; //~ ERROR removing an expression
-}
diff --git a/src/test/ui/expr/if/attrs/bad-cfg.stderr b/src/test/ui/expr/if/attrs/bad-cfg.stderr
deleted file mode 100644
index 8a2890886..000000000
--- a/src/test/ui/expr/if/attrs/bad-cfg.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: removing an expression is not supported in this position
-  --> $DIR/bad-cfg.rs:4:13
-   |
-LL |     let _ = #[cfg(FALSE)] if true {};
-   |             ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/expr/if/attrs/builtin-if-attr.rs b/src/test/ui/expr/if/attrs/builtin-if-attr.rs
deleted file mode 100644
index 7e2906615..000000000
--- a/src/test/ui/expr/if/attrs/builtin-if-attr.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// check-pass
-
-fn main() {
-    #[allow(unused_variables)]
-    if true {
-        let a = 1;
-    } else if false {
-        let b = 1;
-    } else {
-        let c = 1;
-    }
-}
diff --git a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs b/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs
deleted file mode 100644
index 1f77a1bb3..000000000
--- a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// check-pass
-
-#[cfg(FALSE)]
-fn simple_attr() {
-    #[attr] if true {}
-    #[allow_warnings] if true {}
-}
-
-#[cfg(FALSE)]
-fn if_else_chain() {
-    #[first_attr] if true {
-    } else if false {
-    } else {
-    }
-}
-
-#[cfg(FALSE)]
-fn if_let() {
-    #[attr] if let Some(_) = Some(true) {}
-}
-
-fn bar() {
-    #[cfg(FALSE)]
-    if true {
-        let x: () = true; // Should not error due to the #[cfg(FALSE)]
-    }
-
-    #[cfg_attr(not(unset_attr), cfg(FALSE))]
-    if true {
-        let a: () = true; // Should not error due to the applied #[cfg(FALSE)]
-    }
-}
-
-macro_rules! custom_macro {
-    ($expr:expr) => {}
-}
-
-custom_macro! {
-    #[attr] if true {}
-}
-
-
-fn main() {}
diff --git a/src/test/ui/expr/if/attrs/else-attrs.rs b/src/test/ui/expr/if/attrs/else-attrs.rs
deleted file mode 100644
index 85da7cf6b..000000000
--- a/src/test/ui/expr/if/attrs/else-attrs.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[cfg(FALSE)]
-fn if_else_parse_error() {
-    if true {
-    } #[attr] else if false { //~ ERROR expected
-    }
-}
-
-#[cfg(FALSE)]
-fn else_attr_ifparse_error() {
-    if true {
-    } else #[attr] if false { //~ ERROR outer attributes are not allowed
-    } else {
-    }
-}
-
-#[cfg(FALSE)]
-fn else_parse_error() {
-    if true {
-    } else if false {
-    } #[attr] else { //~ ERROR expected
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/expr/if/attrs/else-attrs.stderr b/src/test/ui/expr/if/attrs/else-attrs.stderr
deleted file mode 100644
index 273337705..000000000
--- a/src/test/ui/expr/if/attrs/else-attrs.stderr
+++ /dev/null
@@ -1,26 +0,0 @@
-error: expected expression, found keyword `else`
-  --> $DIR/else-attrs.rs:4:15
-   |
-LL |     } #[attr] else if false {
-   |               ^^^^ expected expression
-
-error: outer attributes are not allowed on `if` and `else` branches
-  --> $DIR/else-attrs.rs:11:12
-   |
-LL |       } else #[attr] if false {
-   |  _______----_^^^^^^^_-
-   | |       |    |
-   | |       |    help: remove the attributes
-   | |       the branch belongs to this `else`
-LL | |     } else {
-LL | |     }
-   | |_____- the attributes are attached to this branch
-
-error: expected expression, found keyword `else`
-  --> $DIR/else-attrs.rs:20:15
-   |
-LL |     } #[attr] else {
-   |               ^^^^ expected expression
-
-error: aborting due to 3 previous errors
-
diff --git a/src/test/ui/expr/if/attrs/gate-whole-expr.rs b/src/test/ui/expr/if/attrs/gate-whole-expr.rs
deleted file mode 100644
index 63772d54b..000000000
--- a/src/test/ui/expr/if/attrs/gate-whole-expr.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// run-pass
-
-fn main() {
-    let x = 1;
-
-    #[cfg(FALSE)]
-    if false {
-        x = 2;
-    } else if true {
-        x = 3;
-    } else {
-        x = 4;
-    }
-    assert_eq!(x, 1);
-}
diff --git a/src/test/ui/expr/if/attrs/let-chains-attr.rs b/src/test/ui/expr/if/attrs/let-chains-attr.rs
deleted file mode 100644
index 2cd873114..000000000
--- a/src/test/ui/expr/if/attrs/let-chains-attr.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// check-pass
-
-#![feature(let_chains)]
-
-#[cfg(FALSE)]
-fn foo() {
-    #[attr]
-    if let Some(_) = Some(true) && let Ok(_) = Ok(1) {
-    } else if let Some(false) = Some(true) {
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs b/src/test/ui/expr/if/attrs/stmt-expr-gated.rs
deleted file mode 100644
index 38599c8e6..000000000
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-fn main() {
-    let _ = #[deny(warnings)] if true { //~ ERROR attributes on expressions
-    } else if false {
-    } else {
-    };
-}
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr b/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr
deleted file mode 100644
index 47dac39a9..000000000
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: attributes on expressions are experimental
-  --> $DIR/stmt-expr-gated.rs:2:13
-   |
-LL |     let _ = #[deny(warnings)] if true {
-   |             ^^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
-   = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.