Move tests to SIMD subdirectory

5 files changed, 10 insertions, 10 deletions

diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs
index 0ede0681905..630f5010b85 100644
--- a/src/librustc_mir/interpret/intrinsics.rs
+++ b/src/librustc_mir/interpret/intrinsics.rs
@@ -247,8 +247,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     vector[index] = scalar;
                 } else {
                     throw_ub_format!(
-                        "Inserting `{:?}` with size `{}` to a vector element place of size `{}`",
-                        scalar, scalar.layout.size.bytes(), vector[index].layout.size.bytes()
+                        "Inserting `{}` with size `{}` to a vector element place of size `{}`",
+                        scalar.layout.ty, scalar.layout.size.bytes(), vector[index].layout.size.bytes()
                     );
                 }
                 self.write_vector(vector, dest)?;
diff --git a/src/test/ui/consts/const-eval/const_eval-simd_fail.rs b/src/test/ui/consts/const-eval/simd/insert_extract-fail.rs
index 20c839a81a0..20c839a81a0 100644
--- a/src/test/ui/consts/const-eval/const_eval-simd_fail.rs
+++ b/src/test/ui/consts/const-eval/simd/insert_extract-fail.rs
diff --git a/src/test/ui/consts/const-eval/const_eval-simd_fail.stderr b/src/test/ui/consts/const-eval/simd/insert_extract-fail.stderr
index 9f76287979a..cf4e6887f16 100644
--- a/src/test/ui/consts/const-eval/const_eval-simd_fail.stderr
+++ b/src/test/ui/consts/const-eval/simd/insert_extract-fail.stderr
@@ -1,11 +1,11 @@
 error: any use of this value will cause an error
-  --> $DIR/const_eval-simd_fail.rs:14:14
+  --> $DIR/insert_extract-fail.rs:14:14
    |
 LL |     unsafe { simd_insert(x, 0_u32, 42_i16) }.0
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |              |
    |              Inserting `i16` with size `2` to a vector element place of size `1`
-   |              inside call to `foo` at $DIR/const_eval-simd_fail.rs:19:19
+   |              inside call to `foo` at $DIR/insert_extract-fail.rs:19:19
 ...
 LL |     const X: i8 = foo(V);
    |     ---------------------
diff --git a/src/test/ui/consts/const-eval/const_eval-simd.rs b/src/test/ui/consts/const-eval/simd/insert_extract.rs
index a0f088cc636..a0f088cc636 100644
--- a/src/test/ui/consts/const-eval/const_eval-simd.rs
+++ b/src/test/ui/consts/const-eval/simd/insert_extract.rs
diff --git a/src/test/ui/consts/const-eval/const_eval-simd.stderr b/src/test/ui/consts/const-eval/simd/insert_extract.stderr
index 7fc068718b0..51510273a79 100644
--- a/src/test/ui/consts/const-eval/const_eval-simd.stderr
+++ b/src/test/ui/consts/const-eval/simd/insert_extract.stderr
@@ -1,5 +1,5 @@
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:22:5
+  --> $DIR/insert_extract.rs:22:5
    |
 LL |     assert_eq!(X, 42);
    |     ^^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL |     assert_eq!(X, 42);
    = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:22:5
+  --> $DIR/insert_extract.rs:22:5
    |
 LL |     assert_eq!(X, 42);
    |     ^^^^^^^^^^^^^^^^^^
@@ -15,7 +15,7 @@ LL |     assert_eq!(X, 42);
    = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:22:5
+  --> $DIR/insert_extract.rs:22:5
    |
 LL |     assert_eq!(X, 42);
    |     ^^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL |     assert_eq!(X, 42);
    = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:23:5
+  --> $DIR/insert_extract.rs:23:5
    |
 LL |     assert_eq!(Y, 13);
    |     ^^^^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ LL |     assert_eq!(Y, 13);
    = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:23:5
+  --> $DIR/insert_extract.rs:23:5
    |
 LL |     assert_eq!(Y, 13);
    |     ^^^^^^^^^^^^^^^^^^
@@ -39,7 +39,7 @@ LL |     assert_eq!(Y, 13);
    = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:23:5
+  --> $DIR/insert_extract.rs:23:5
    |
 LL |     assert_eq!(Y, 13);
    |     ^^^^^^^^^^^^^^^^^^