Update tests

Author: ecstatic-morse

src/test/ui/array-slice-vec/subslice-patterns-const-eval-match.rs

@@ -2,7 +2,8 @@
 
 // run-pass
 
-#![feature(const_fn, const_if_match)]
+#![feature(const_fn)]
+
 #[derive(PartialEq, Debug, Clone)]
 struct N(u8);
 

src/test/ui/borrowck/issue-64453.rs

@@ -2,7 +2,8 @@ struct Project;
 struct Value;
 
 static settings_dir: String = format!("");
-//~^ ERROR `match` is not allowed in a `static`
+//~^ ERROR calls in statics are limited to constant functions
+//~| ERROR calls in statics are limited to constant functions
 
 fn from_string(_: String) -> Value {
     Value
@@ -11,6 +12,7 @@ fn set_editor(_: Value) {}
 
 fn main() {
     let settings_data = from_string(settings_dir);
+    //~^ ERROR cannot move out of static item
     let args: i32 = 0;
 
     match args {

src/test/ui/borrowck/issue-64453.stderr

@@ -1,13 +1,26 @@
-error[E0658]: `match` is not allowed in a `static`
+error[E0507]: cannot move out of static item `settings_dir`
+  --> $DIR/issue-64453.rs:14:37
+   |
+LL |     let settings_data = from_string(settings_dir);
+   |                                     ^^^^^^^^^^^^ move occurs because `settings_dir` has type `std::string::String`, which does not implement the `Copy` trait
+
+error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants
+  --> $DIR/issue-64453.rs:4:31
+   |
+LL | static settings_dir: String = format!("");
+   |                               ^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants
   --> $DIR/issue-64453.rs:4:31
    |
 LL | static settings_dir: String = format!("");
    |                               ^^^^^^^^^^^
    |
-   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0658`.
+Some errors have detailed explanations: E0015, E0507.
+For more information about an error, try `rustc --explain E0015`.

src/test/ui/consts/const-eval/infinite_loop.rs

@@ -7,7 +7,6 @@ fn main() {
         //~^ ERROR `while` is not allowed in a `const`
             n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
             //~^ ERROR evaluation of constant value failed
-            //~| ERROR `if` is not allowed in a `const`
         }
         n
     }];

src/test/ui/consts/const-eval/infinite_loop.stderr

@@ -5,30 +5,19 @@ LL | /         while n != 0 {
 LL | |
 LL | |             n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
 LL | |
-LL | |
 LL | |         }
    | |_________^
    |
    = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-
-error[E0658]: `if` is not allowed in a `const`
-  --> $DIR/infinite_loop.rs:8:17
-   |
-LL |             n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/infinite_loop.rs:8:17
    |
 LL |             n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ exceeded interpreter step limit (see `#[const_eval_limit]`)
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 Some errors have detailed explanations: E0080, E0658.
 For more information about an error, try `rustc --explain E0080`.

src/test/ui/consts/const-eval/issue-52475.stderr

@@ -10,7 +10,6 @@ LL | |         }
    |
    = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/issue-52475.rs:7:17

src/test/ui/consts/const-eval/match-test-ptr-null.rs

@@ -5,7 +5,6 @@ fn main() {
     let _: [u8; 0] = [4; {
         match &1 as *const i32 as usize {
             //~^ ERROR casting pointers to integers in constants
-            //~| ERROR `match` is not allowed in a `const`
             //~| ERROR evaluation of constant value failed
             0 => 42,
             n => n,

src/test/ui/consts/const-eval/match-test-ptr-null.stderr

@@ -1,18 +1,3 @@
-error[E0658]: `match` is not allowed in a `const`
-  --> $DIR/match-test-ptr-null.rs:6:9
-   |
-LL | /         match &1 as *const i32 as usize {
-LL | |
-LL | |
-LL | |
-LL | |             0 => 42,
-LL | |             n => n,
-LL | |         }
-   | |_________^
-   |
-   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-
 error[E0658]: casting pointers to integers in constants is unstable
   --> $DIR/match-test-ptr-null.rs:6:15
    |
@@ -28,7 +13,7 @@ error[E0080]: evaluation of constant value failed
 LL |         match &1 as *const i32 as usize {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^ "pointer-to-integer cast" needs an rfc before being allowed inside constants
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 Some errors have detailed explanations: E0080, E0658.
 For more information about an error, try `rustc --explain E0080`.

src/test/ui/consts/const-labeled-break.stderr

@@ -6,7 +6,6 @@ LL | const CRASH: () = 'a: while break 'a {};
    |
    = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
-   = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error: aborting due to previous error
 

src/test/ui/consts/const-match-pattern-arm.rs

@@ -1,12 +1,12 @@
-#![allow(warnings)]
+// check-pass
 
-const x: bool = match Some(true) { //~ ERROR `match` is not allowed in a `const`
+const _: bool = match Some(true) {
     Some(value) => true,
     _ => false
 };
 
-const y: bool = {
-    match Some(true) { //~ ERROR `match` is not allowed in a `const`
+const _: bool = {
+    match Some(true) {
         Some(value) => true,
         _ => false
     }

src/test/ui/consts/const-match-pattern-arm.stderr

@@ -1,6 +1,5 @@
 // run-pass
 
-#![feature(const_if_match)]
 #![warn(indirect_structural_match)]
 
 struct CustomEq;

src/test/ui/consts/const_in_pattern/custom-eq-branch-pass.rs

@@ -1,6 +1,5 @@
 // check-pass
 
-#![feature(const_if_match)]
 #![warn(indirect_structural_match)]
 //~^ NOTE lint level is defined here
 

src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.rs

@@ -1,11 +1,11 @@
 warning: to use a constant of type `CustomEq` in a pattern, `CustomEq` must be annotated with `#[derive(PartialEq, Eq)]`
-  --> $DIR/custom-eq-branch-warn.rs:33:9
+  --> $DIR/custom-eq-branch-warn.rs:32:9
    |
 LL |         BAR_BAZ => panic!(),
    |         ^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/custom-eq-branch-warn.rs:4:9
+  --> $DIR/custom-eq-branch-warn.rs:3:9
    |
 LL | #![warn(indirect_structural_match)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/consts/const_in_pattern/custom-eq-branch-warn.stderr

@@ -1,4 +1,3 @@
-#![feature(const_if_match)]
 #![warn(indirect_structural_match)]
 
 struct NoEq;

src/test/ui/consts/const_in_pattern/no-eq-branch-fail.rs

@@ -1,11 +1,11 @@
 error: to use a constant of type `Foo` in a pattern, `Foo` must be annotated with `#[derive(PartialEq, Eq)]`
-  --> $DIR/no-eq-branch-fail.rs:22:9
+  --> $DIR/no-eq-branch-fail.rs:21:9
    |
 LL |         BAR_BAZ => panic!(),
    |         ^^^^^^^
 
 error: to use a constant of type `Foo` in a pattern, `Foo` must be annotated with `#[derive(PartialEq, Eq)]`
-  --> $DIR/no-eq-branch-fail.rs:22:9
+  --> $DIR/no-eq-branch-fail.rs:21:9
    |
 LL |         BAR_BAZ => panic!(),
    |         ^^^^^^^

src/test/ui/consts/const_in_pattern/no-eq-branch-fail.stderr

@@ -2,6 +2,5 @@ fn main() {}
 
 const fn slice(&[a, b]: &[i32]) -> i32 {
     //~^ ERROR refutable pattern in function argument
-    //~| ERROR loops and conditional expressions are not stable in const fn
     a + b
 }

src/test/ui/consts/const_let_refutable.rs

@@ -6,16 +6,6 @@ LL | const fn slice(&[a, b]: &[i32]) -> i32 {
    |
    = note: the matched value is of type `&[i32]`
 
-error[E0723]: loops and conditional expressions are not stable in const fn
-  --> $DIR/const_let_refutable.rs:3:17
-   |
-LL | const fn slice(&[a, b]: &[i32]) -> i32 {
-   |                 ^^^^^^
-   |
-   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
-   = help: add `#![feature(const_fn)]` to the crate attributes to enable
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0005, E0723.
-For more information about an error, try `rustc --explain E0005`.
+For more information about this error, try `rustc --explain E0005`.

src/test/ui/consts/const_let_refutable.stderr

@@ -1,7 +1,7 @@
 // check-pass
 
 #![feature(const_eval_limit)]
-#![feature(const_loop, const_if_match)]
+#![feature(const_loop)]
 
 // This needs to be higher than the number of loop iterations since each pass through the loop may
 // hit more than one terminator.

src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs

@@ -1,7 +1,6 @@
 #![feature(const_eval_limit)]
-#![feature(const_loop, const_if_match)]
-
-#![const_eval_limit="500"]
+#![feature(const_loop)]
+#![const_eval_limit = "500"]
 
 const X: usize = {
     let mut x = 0;

src/test/ui/consts/const_limit/const_eval_limit_reached.rs

@@ -1,5 +1,5 @@
 error: any use of this value will cause an error
-  --> $DIR/const_eval_limit_reached.rs:8:5
+  --> $DIR/const_eval_limit_reached.rs:7:11
    |
 LL |  / const X: usize = {
 LL |  |     let mut x = 0;

src/test/ui/consts/const_limit/const_eval_limit_reached.stderr

@@ -1,13 +1,13 @@
+// check-pass
+
 const _: bool = false && false;
 const _: bool = true && false;
 const _: bool = {
     let mut x = true && false;
-    //~^ ERROR new features like let bindings are not permitted
     x
 };
 const _: bool = {
     let x = true && false;
-    //~^ ERROR new features like let bindings are not permitted
     x
 };