Skip to content

Commit effa869

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Update transmute size lints.
Also moves a few transmute tests to UI tests to better test their output.
1 parent 28cc0c5 commit effa869

17 files changed

+247
-33
lines changed

‎src/librustc/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ fn takes_u8(_: u8) {}
16311631
16321632
fn main() {
16331633
unsafe { takes_u8(::std::mem::transmute(0u16)); }
1634-
// error: transmute called with differently sized types
1634+
// error: transmute called with types of different sizes
16351635
}
16361636
```
16371637

‎src/librustc/middle/intrinsicck.rs

+10-16
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,16 @@ impl<'a, 'tcx> ExprVisitor<'a, 'tcx> {
8686
// Special-case transmutting from `typeof(function)` and
8787
// `Option<typeof(function)>` to present a clearer error.
8888
let from = unpack_option_like(self.tcx.global_tcx(), from);
89-
match (&from.sty, sk_to) {
90-
(&ty::TyFnDef(..), SizeSkeleton::Known(size_to))
91-
if size_to == Pointer.size(self.tcx) => {
89+
if let (&ty::TyFnDef(..), SizeSkeleton::Known(size_to)) = (&from.sty, sk_to) {
90+
if size_to == Pointer.size(self.tcx) => {
9291
struct_span_err!(self.tcx.sess, span, E0591,
93-
"`{}` is zero-sized and can't be transmuted to `{}`",
94-
from, to)
95-
.span_note(span, "cast with `as` to a pointer instead")
92+
"can't transmute zero-sized type")
93+
.note(&format!("source type: {}", from))
94+
.note(&format!("target type: {}", to))
95+
.help("cast with `as` to a pointer instead")
9696
.emit();
9797
return;
9898
}
99-
_ => {}
10099
}
101100
}
102101

@@ -111,7 +110,7 @@ impl<'a, 'tcx> ExprVisitor<'a, 'tcx> {
111110
}
112111
Err(LayoutError::Unknown(bad)) => {
113112
if bad == ty {
114-
format!("size can vary")
113+
format!("this type's size can vary")
115114
} else {
116115
format!("size can vary because of {}", bad)
117116
}
@@ -121,14 +120,9 @@ impl<'a, 'tcx> ExprVisitor<'a, 'tcx> {
121120
};
122121

123122
struct_span_err!(self.tcx.sess, span, E0512,
124-
"transmute called with differently sized types: \
125-
{} ({}) to {} ({})",
126-
from, skeleton_string(from, sk_from),
127-
to, skeleton_string(to, sk_to))
128-
.span_label(span,
129-
format!("transmuting between {} and {}",
130-
skeleton_string(from, sk_from),
131-
skeleton_string(to, sk_to)))
123+
"transmute called with types of different sizes")
124+
.note(&format!("source type: {} ({})", from, skeleton_string(from, sk_from)))
125+
.note(&format!("target type: {} ({})", to, skeleton_string(to, sk_to)))
132126
.emit();
133127
}
134128
}

‎src/test/compile-fail/E0512.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ fn takes_u8(_: u8) {}
1212

1313
fn main() {
1414
unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
15-
//~| transmuting between 16 bits and 8 bits
1615
}

‎src/test/compile-fail/issue-21174.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ trait Trait<'a> {
1515

1616
fn foo<'a, T: Trait<'a>>(value: T::A) {
1717
let new: T::B = unsafe { std::mem::transmute(value) };
18-
//~^ ERROR: transmute called with differently sized types
18+
//~^ ERROR: transmute called with types of different sizes
1919
}
2020

2121
fn main() { }

‎src/test/compile-fail/issue-28625.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct ArrayPeano<T: Bar> {
1717
}
1818

1919
fn foo<T>(a: &ArrayPeano<T>) -> &[T] where T: Bar {
20-
unsafe { std::mem::transmute(a) } //~ ERROR transmute called with differently sized types
20+
unsafe { std::mem::transmute(a) } //~ ERROR transmute called with types of different sizes
2121
}
2222

2323
impl Bar for () {

‎src/test/compile-fail/issue-32377.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct Bar<U: Foo> {
2121

2222
fn foo<U: Foo>(x: [usize; 2]) -> Bar<U> {
2323
unsafe { mem::transmute(x) }
24-
//~^ ERROR transmute called with differently sized types
24+
//~^ ERROR transmute called with types of different sizes
2525
}
2626

2727
fn main() {}

‎src/test/compile-fail/packed-struct-generic-transmute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// the error points to the start of the file, not the line with the
1414
// transmute
1515

16-
// error-pattern: transmute called with differently sized types
16+
// error-pattern: transmute called with types of different sizes
1717

1818
use std::mem;
1919

‎src/test/compile-fail/packed-struct-transmute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// the error points to the start of the file, not the line with the
1414
// transmute
1515

16-
// error-pattern: transmute called with differently sized types
16+
// error-pattern: transmute called with types of different sizes
1717

1818
use std::mem;
1919

‎src/test/compile-fail/transmute-different-sizes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ use std::mem::transmute;
1717

1818
unsafe fn f() {
1919
let _: i8 = transmute(16i16);
20-
//~^ ERROR transmute called with differently sized types
20+
//~^ ERROR transmute called with types of different sizes
2121
}
2222

2323
unsafe fn g<T>(x: &T) {
2424
let _: i8 = transmute(x);
25-
//~^ ERROR transmute called with differently sized types
25+
//~^ ERROR transmute called with types of different sizes
2626
}
2727

2828
trait Specializable { type Output; }
@@ -33,7 +33,7 @@ impl<T> Specializable for T {
3333

3434
unsafe fn specializable<T>(x: u16) -> <T as Specializable>::Output {
3535
transmute(x)
36-
//~^ ERROR transmute called with differently sized types
36+
//~^ ERROR transmute called with types of different sizes
3737
}
3838

3939
fn main() {}

‎src/test/compile-fail/transmute-fat-pointers.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
use std::mem::transmute;
1616

1717
fn a<T, U: ?Sized>(x: &[T]) -> &U {
18-
unsafe { transmute(x) } //~ ERROR transmute called with differently sized types
18+
unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
1919
}
2020

2121
fn b<T: ?Sized, U: ?Sized>(x: &T) -> &U {
22-
unsafe { transmute(x) } //~ ERROR transmute called with differently sized types
22+
unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
2323
}
2424

2525
fn c<T, U>(x: &T) -> &U {
@@ -31,11 +31,11 @@ fn d<T, U>(x: &[T]) -> &[U] {
3131
}
3232

3333
fn e<T: ?Sized, U>(x: &T) -> &U {
34-
unsafe { transmute(x) } //~ ERROR transmute called with differently sized types
34+
unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
3535
}
3636

3737
fn f<T, U: ?Sized>(x: &T) -> &U {
38-
unsafe { transmute(x) } //~ ERROR transmute called with differently sized types
38+
unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
3939
}
4040

4141
fn main() { }

‎src/test/compile-fail/transmute-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl<T: ?Sized> Foo<T> {
2626

2727
fn n(x: &T) -> &isize {
2828
// Not OK here, because T : Sized is not in scope.
29-
unsafe { transmute(x) } //~ ERROR transmute called with differently sized types
29+
unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
3030
}
3131
}
3232

‎src/test/ui/transmute/main.rs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
#![feature(untagged_unions)]
11+
use std::mem::transmute;
12+
13+
pub trait TypeConstructor<'a> {
14+
type T;
15+
}
16+
17+
unsafe fn transmute_lifetime<'a, 'b, C>(x: <C as TypeConstructor<'a>>::T)
18+
-> <C as TypeConstructor<'b>>::T
19+
where for<'z> C: TypeConstructor<'z> {
20+
transmute(x) //~ ERROR transmute called with types of different sizes
21+
}
22+
23+
unsafe fn sizes() {
24+
let x: u8 = transmute(10u16); //~ ERROR transmute called with types of different sizes
25+
}
26+
27+
unsafe fn ptrs() {
28+
let x: u8 = transmute("test"); //~ ERROR transmute called with types of different sizes
29+
}
30+
31+
union Foo { x: () }
32+
unsafe fn vary() {
33+
let x: Foo = transmute(10); //~ ERROR transmute called with types of different sizes
34+
}
35+
36+
fn main() {}

‎src/test/ui/transmute/main.stderr

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
error[E0512]: transmute called with types of different sizes
2+
--> $DIR/main.rs:20:5
3+
|
4+
20 | transmute(x) //~ ERROR transmute called with types of different sizes
5+
| ^^^^^^^^^
6+
|
7+
= note: source type: <C as TypeConstructor<'a>>::T (size can vary because of <C as TypeConstructor>::T)
8+
= note: target type: <C as TypeConstructor<'b>>::T (size can vary because of <C as TypeConstructor>::T)
9+
10+
error[E0512]: transmute called with types of different sizes
11+
--> $DIR/main.rs:24:17
12+
|
13+
24 | let x: u8 = transmute(10u16); //~ ERROR transmute called with types of different sizes
14+
| ^^^^^^^^^
15+
|
16+
= note: source type: u16 (16 bits)
17+
= note: target type: u8 (8 bits)
18+
19+
error[E0512]: transmute called with types of different sizes
20+
--> $DIR/main.rs:28:17
21+
|
22+
28 | let x: u8 = transmute("test"); //~ ERROR transmute called with types of different sizes
23+
| ^^^^^^^^^
24+
|
25+
= note: source type: &str (128 bits)
26+
= note: target type: u8 (8 bits)
27+
28+
error[E0512]: transmute called with types of different sizes
29+
--> $DIR/main.rs:33:18
30+
|
31+
33 | let x: Foo = transmute(10); //~ ERROR transmute called with types of different sizes
32+
| ^^^^^^^^^
33+
|
34+
= note: source type: i32 (32 bits)
35+
= note: target type: Foo (0 bits)
36+
37+
error: aborting due to previous error(s)
38+

‎src/test/compile-fail/transmute-from-fn-item-types-error.rs renamed to ‎src/test/ui/transmute/transmute-from-fn-item-types-error.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ unsafe fn foo() -> (isize, *const (), Option<fn()>) {
2929
unsafe fn bar() {
3030
// Error as usual if the resulting type is not pointer-sized.
3131
mem::transmute::<_, u8>(main);
32-
//~^ ERROR transmute called with differently sized types
33-
//~^^ NOTE transmuting between 0 bits and 8 bits
32+
//~^ ERROR transmute called with types of different sizes
33+
//~^^ NOTE transmuting between fn() {main} and u8
3434

3535
mem::transmute::<_, *mut ()>(foo);
3636
//~^ ERROR is zero-sized and can't be transmuted

‎src/test/ui/transmute/transmute-from-fn-item-types-error.stderr

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
error[E0591]: can't transmute zero-sized type
2+
--> $DIR/transmute-from-fn-item-types-error.rs:14:13
3+
|
4+
14 | let i = mem::transmute(bar);
5+
| ^^^^^^^^^^^^^^
6+
|
7+
= note: source type: unsafe fn() {bar}
8+
= note: target type: isize
9+
= help: cast with `as` to a pointer instead
10+
11+
error[E0591]: can't transmute zero-sized type
12+
--> $DIR/transmute-from-fn-item-types-error.rs:18:13
13+
|
14+
18 | let p = mem::transmute(foo);
15+
| ^^^^^^^^^^^^^^
16+
|
17+
= note: source type: unsafe fn() -> (isize, *const (), std::option::Option<fn()>) {foo}
18+
= note: target type: *const ()
19+
= help: cast with `as` to a pointer instead
20+
21+
error[E0591]: can't transmute zero-sized type
22+
--> $DIR/transmute-from-fn-item-types-error.rs:22:14
23+
|
24+
22 | let of = mem::transmute(main);
25+
| ^^^^^^^^^^^^^^
26+
|
27+
= note: source type: fn() {main}
28+
= note: target type: std::option::Option<fn()>
29+
= help: cast with `as` to a pointer instead
30+
31+
error[E0512]: transmute called with types of different sizes
32+
--> $DIR/transmute-from-fn-item-types-error.rs:31:5
33+
|
34+
31 | mem::transmute::<_, u8>(main);
35+
| ^^^^^^^^^^^^^^^^^^^^^^^
36+
|
37+
= note: source type: fn() {main} (0 bits)
38+
= note: target type: u8 (8 bits)
39+
40+
error[E0591]: can't transmute zero-sized type
41+
--> $DIR/transmute-from-fn-item-types-error.rs:35:5
42+
|
43+
35 | mem::transmute::<_, *mut ()>(foo);
44+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
45+
|
46+
= note: source type: unsafe fn() -> (isize, *const (), std::option::Option<fn()>) {foo}
47+
= note: target type: *mut ()
48+
= help: cast with `as` to a pointer instead
49+
50+
error[E0591]: can't transmute zero-sized type
51+
--> $DIR/transmute-from-fn-item-types-error.rs:39:5
52+
|
53+
39 | mem::transmute::<_, fn()>(bar);
54+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
55+
|
56+
= note: source type: unsafe fn() {bar}
57+
= note: target type: fn()
58+
= help: cast with `as` to a pointer instead
59+
60+
error[E0591]: can't transmute zero-sized type
61+
--> $DIR/transmute-from-fn-item-types-error.rs:48:5
62+
|
63+
48 | mem::transmute::<_, *mut ()>(Some(foo));
64+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
65+
|
66+
= note: source type: unsafe fn() -> (isize, *const (), std::option::Option<fn()>) {foo}
67+
= note: target type: *mut ()
68+
= help: cast with `as` to a pointer instead
69+
70+
error[E0591]: can't transmute zero-sized type
71+
--> $DIR/transmute-from-fn-item-types-error.rs:52:5
72+
|
73+
52 | mem::transmute::<_, fn()>(Some(bar));
74+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
75+
|
76+
= note: source type: unsafe fn() {bar}
77+
= note: target type: fn()
78+
= help: cast with `as` to a pointer instead
79+
80+
error[E0591]: can't transmute zero-sized type
81+
--> $DIR/transmute-from-fn-item-types-error.rs:56:5
82+
|
83+
56 | mem::transmute::<_, Option<fn()>>(Some(baz));
84+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
85+
|
86+
= note: source type: unsafe fn() {baz}
87+
= note: target type: std::option::Option<fn()>
88+
= help: cast with `as` to a pointer instead
89+
90+
error: aborting due to previous error(s)
91+

‎src/test/compile-fail/transmute-type-parameters.rs renamed to ‎src/test/ui/transmute/transmute-type-parameters.rs

File renamed without changes.

0 commit comments

Comments
 (0)