Rollup merge of rust-lang#81481 - lcnr:cast-tests, r=jackh726

move some tests
JohnTitor · Feb 2, 2021 · 9860b31 · 9860b31
2 parents d4e3570 + 61f6fa7
commit 9860b31
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/src/test/ui/fat-ptr-cast-rpass.rs → src/test/ui/cast/fat-ptr-cast-rpass.rs b/src/test/ui/fat-ptr-cast-rpass.rs → src/test/ui/cast/fat-ptr-cast-rpass.rs
diff --git a/src/test/ui/fat-ptr-cast.rs → src/test/ui/cast/fat-ptr-cast.rs b/src/test/ui/fat-ptr-cast.rs → src/test/ui/cast/fat-ptr-cast.rs
diff --git a/src/test/ui/fat-ptr-cast.stderr → src/test/ui/cast/fat-ptr-cast.stderr b/src/test/ui/fat-ptr-cast.stderr → src/test/ui/cast/fat-ptr-cast.stderr
diff --git a/src/test/ui/issues/issue-17444.rs → src/test/ui/cast/issue-17444.rs b/src/test/ui/issues/issue-17444.rs → src/test/ui/cast/issue-17444.rs
diff --git a/src/test/ui/issues/issue-17444.stderr → src/test/ui/cast/issue-17444.stderr b/src/test/ui/issues/issue-17444.stderr → src/test/ui/cast/issue-17444.stderr
diff --git a/src/test/ui/cast/unsupported-cast.rs b/src/test/ui/cast/unsupported-cast.rs
@@ -0,0 +1,5 @@
+struct A;
+
+fn main() {
+  println!("{:?}", 1.0 as *const A); //~ERROR  casting `f64` as `*const A` is invalid
+}
diff --git a/src/test/ui/unsupported-cast.stderr → src/test/ui/cast/unsupported-cast.stderr b/src/test/ui/unsupported-cast.stderr → src/test/ui/cast/unsupported-cast.stderr
@@ -1,7 +1,7 @@
 error[E0606]: casting `f64` as `*const A` is invalid
-  --> $DIR/unsupported-cast.rs:6:20
+  --> $DIR/unsupported-cast.rs:4:20
    |
-LL |   println!("{:?}", 1.0 as *const A); // Can't cast float to foreign.
+LL |   println!("{:?}", 1.0 as *const A);
    |                    ^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

diff --git a/src/test/ui/unsupported-cast.rs b/src/test/ui/unsupported-cast.rs