about summary refs log tree commit diff
path: root/src/test/ui/packed-struct
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2018-12-21 14:15:47 +0000
committervarkor <github@varkor.com>2018-12-28 19:23:22 +0000
commit6cb1d953fd9c209a49bf14a0cb4505306c150a19 (patch)
tree029ed03a68080f0ee4aa787af5fbbcb3af7acf75 /src/test/ui/packed-struct
parent3cda631ea45bac643ed9e4968f9292b0244a5b82 (diff)
downloadrust-6cb1d953fd9c209a49bf14a0cb4505306c150a19.tar.gz
rust-6cb1d953fd9c209a49bf14a0cb4505306c150a19.zip
Clarify wording of E0512
Diffstat (limited to 'src/test/ui/packed-struct')
-rw-r--r--src/test/ui/packed-struct/packed-struct-generic-transmute.rs2
-rw-r--r--src/test/ui/packed-struct/packed-struct-generic-transmute.stderr6
-rw-r--r--src/test/ui/packed-struct/packed-struct-transmute.rs2
-rw-r--r--src/test/ui/packed-struct/packed-struct-transmute.stderr6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs b/src/test/ui/packed-struct/packed-struct-generic-transmute.rs
index a2502a53c9d..c6264b6d2b3 100644
--- a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs
+++ b/src/test/ui/packed-struct/packed-struct-generic-transmute.rs
@@ -3,7 +3,7 @@
 // the error points to the start of the file, not the line with the
 // transmute
 
-// error-pattern: transmute called with types of different sizes
+// error-pattern: cannot transmute between types of different sizes, or dependently-sized types
 
 use std::mem;
 
diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr b/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr
index b66cb039b80..744c832dbb4 100644
--- a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr
+++ b/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr
@@ -1,11 +1,11 @@
-error[E0512]: transmute called with types of different sizes
+error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/packed-struct-generic-transmute.rs:24:38
    |
 LL |         let oof: Oof<[u8; 5], i32> = mem::transmute(foo);
    |                                      ^^^^^^^^^^^^^^
    |
-   = note: source type: Foo<[u8; 5], i32> (72 bits)
-   = note: target type: Oof<[u8; 5], i32> (96 bits)
+   = note: source type: `Foo<[u8; 5], i32>` (72 bits)
+   = note: target type: `Oof<[u8; 5], i32>` (96 bits)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.rs b/src/test/ui/packed-struct/packed-struct-transmute.rs
index 3d1580004b8..a7d284025d7 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.rs
+++ b/src/test/ui/packed-struct/packed-struct-transmute.rs
@@ -4,7 +4,7 @@
 // transmute
 
 // normalize-stderr-test "\d+ bits" -> "N bits"
-// error-pattern: transmute called with types of different sizes
+// error-pattern: cannot transmute between types of different sizes, or dependently-sized types
 
 use std::mem;
 
diff --git a/src/test/ui/packed-struct/packed-struct-transmute.stderr b/src/test/ui/packed-struct/packed-struct-transmute.stderr
index d1fb443f310..80a8919f77b 100644
--- a/src/test/ui/packed-struct/packed-struct-transmute.stderr
+++ b/src/test/ui/packed-struct/packed-struct-transmute.stderr
@@ -1,11 +1,11 @@
-error[E0512]: transmute called with types of different sizes
+error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/packed-struct-transmute.rs:26:24
    |
 LL |         let oof: Oof = mem::transmute(foo);
    |                        ^^^^^^^^^^^^^^
    |
-   = note: source type: Foo (N bits)
-   = note: target type: Oof (N bits)
+   = note: source type: `Foo` (N bits)
+   = note: target type: `Oof` (N bits)
 
 error: aborting due to previous error