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
  }