Move tests to SIMD subdirectory

rust-lang · Sep 24, 2019 · f0bbd2b · f0bbd2b
1 parent 75d8199
commit f0bbd2b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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/...consts/const-eval/const_eval-simd_fail.rs → ...ts/const-eval/simd/insert_extract-fail.rs b/...consts/const-eval/const_eval-simd_fail.rs → ...ts/const-eval/simd/insert_extract-fail.rs
diff --git a/...ts/const-eval/const_eval-simd_fail.stderr → ...onst-eval/simd/insert_extract-fail.stderr b/...ts/const-eval/const_eval-simd_fail.stderr → ...onst-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/...t/ui/consts/const-eval/const_eval-simd.rs → .../consts/const-eval/simd/insert_extract.rs b/...t/ui/consts/const-eval/const_eval-simd.rs → .../consts/const-eval/simd/insert_extract.rs
diff --git a/.../consts/const-eval/const_eval-simd.stderr → ...sts/const-eval/simd/insert_extract.stderr b/.../consts/const-eval/const_eval-simd.stderr → ...sts/const-eval/simd/insert_extract.stderr
@@ -1,45 +1,45 @@
 warning: skipping const checks
-  --> $DIR/const_eval-simd.rs:22:5
+  --> $DIR/insert_extract.rs:22:5
    |
 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);
    |     ^^^^^^^^^^^^^^^^^^
    |
    = 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);
    |     ^^^^^^^^^^^^^^^^^^
    |
    = 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);
    |     ^^^^^^^^^^^^^^^^^^
    |
    = 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);
    |     ^^^^^^^^^^^^^^^^^^
    |
    = 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);
    |     ^^^^^^^^^^^^^^^^^^