about summary refs log tree commit diff
path: root/tests/ui/array-slice-vec
diff options
context:
space:
mode:
authorTrevor Gross <tmgross@umich.edu>2025-06-04 18:10:09 +0000
committerTrevor Gross <tmgross@umich.edu>2025-06-04 18:10:09 +0000
commit1599091459580e2e20b7b874da111b6cbdb6ae36 (patch)
tree3e2760654cd60d51bac509aedcb06a21241654cb /tests/ui/array-slice-vec
parenteb45e57afe52ba549a3929b58dc9060541bf0a20 (diff)
parentdf8102fe5f24f28a918660b0cd918d7331c3896e (diff)
downloadrust-1599091459580e2e20b7b874da111b6cbdb6ae36.tar.gz
rust-1599091459580e2e20b7b874da111b6cbdb6ae36.zip
Merge ref 'df8102fe5f24:/library/compiler-builtins' from https://github.com/rust-lang/rust
Pull recent changes from rust-lang/rust via Josh.

Upstream ref: df8102fe5f24f28a918660b0cd918d7331c3896e
Filtered ref: 3c30d8cb1ec24e0b8a88a5cedcf6b9bece0117d7
Diffstat (limited to 'tests/ui/array-slice-vec')
-rw-r--r--tests/ui/array-slice-vec/array_const_index-0.rs3
-rw-r--r--tests/ui/array-slice-vec/array_const_index-0.stderr4
-rw-r--r--tests/ui/array-slice-vec/array_const_index-1.rs3
-rw-r--r--tests/ui/array-slice-vec/array_const_index-1.stderr4
4 files changed, 6 insertions, 8 deletions
diff --git a/tests/ui/array-slice-vec/array_const_index-0.rs b/tests/ui/array-slice-vec/array_const_index-0.rs
index f4fe89a50c2..aef07d952fa 100644
--- a/tests/ui/array-slice-vec/array_const_index-0.rs
+++ b/tests/ui/array-slice-vec/array_const_index-0.rs
@@ -1,7 +1,6 @@
 const A: &'static [i32] = &[];
 const B: i32 = (&A)[1];
-//~^ NOTE index out of bounds: the length is 0 but the index is 1
-//~| ERROR evaluation of constant value failed
+//~^ ERROR index out of bounds: the length is 0 but the index is 1
 
 fn main() {
     let _ = B;
diff --git a/tests/ui/array-slice-vec/array_const_index-0.stderr b/tests/ui/array-slice-vec/array_const_index-0.stderr
index d16e8d50dfd..1080705713b 100644
--- a/tests/ui/array-slice-vec/array_const_index-0.stderr
+++ b/tests/ui/array-slice-vec/array_const_index-0.stderr
@@ -1,8 +1,8 @@
-error[E0080]: evaluation of constant value failed
+error[E0080]: index out of bounds: the length is 0 but the index is 1
   --> $DIR/array_const_index-0.rs:2:16
    |
 LL | const B: i32 = (&A)[1];
-   |                ^^^^^^^ index out of bounds: the length is 0 but the index is 1
+   |                ^^^^^^^ evaluation of constant value failed here
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/array-slice-vec/array_const_index-1.rs b/tests/ui/array-slice-vec/array_const_index-1.rs
index 0d4de137a6e..4adbd157ed0 100644
--- a/tests/ui/array-slice-vec/array_const_index-1.rs
+++ b/tests/ui/array-slice-vec/array_const_index-1.rs
@@ -1,7 +1,6 @@
 const A: [i32; 0] = [];
 const B: i32 = A[1];
-//~^ NOTE index out of bounds: the length is 0 but the index is 1
-//~| ERROR evaluation of constant value failed
+//~^ ERROR index out of bounds: the length is 0 but the index is 1
 
 fn main() {
     let _ = B;
diff --git a/tests/ui/array-slice-vec/array_const_index-1.stderr b/tests/ui/array-slice-vec/array_const_index-1.stderr
index f9ba2f13911..56299848d92 100644
--- a/tests/ui/array-slice-vec/array_const_index-1.stderr
+++ b/tests/ui/array-slice-vec/array_const_index-1.stderr
@@ -1,8 +1,8 @@
-error[E0080]: evaluation of constant value failed
+error[E0080]: index out of bounds: the length is 0 but the index is 1
   --> $DIR/array_const_index-1.rs:2:16
    |
 LL | const B: i32 = A[1];
-   |                ^^^^ index out of bounds: the length is 0 but the index is 1
+   |                ^^^^ evaluation of constant value failed here
 
 error: aborting due to 1 previous error