Auto merge of #32232 - jonas-schievink:issue31511, r=eddyb
Give a more accurate error on thin-to-fat ptr cast Fixes #31511
This commit is contained in:
commit
af8f85cc39
|
@ -100,6 +100,8 @@ enum CastError {
|
||||||
CastToBool,
|
CastToBool,
|
||||||
CastToChar,
|
CastToChar,
|
||||||
DifferingKinds,
|
DifferingKinds,
|
||||||
|
/// Cast of thin to fat raw ptr (eg. `*const () as *const [u8]`)
|
||||||
|
SizedUnsizedCast,
|
||||||
IllegalCast,
|
IllegalCast,
|
||||||
NeedViaPtr,
|
NeedViaPtr,
|
||||||
NeedViaThinPtr,
|
NeedViaThinPtr,
|
||||||
|
@ -165,6 +167,13 @@ impl<'tcx> CastCheck<'tcx> {
|
||||||
fcx.infcx().ty_to_string(self.cast_ty))
|
fcx.infcx().ty_to_string(self.cast_ty))
|
||||||
}, self.expr_ty, None);
|
}, self.expr_ty, None);
|
||||||
}
|
}
|
||||||
|
CastError::SizedUnsizedCast => {
|
||||||
|
fcx.type_error_message(self.span, |actual| {
|
||||||
|
format!("cannot cast thin pointer `{}` to fat pointer `{}`",
|
||||||
|
actual,
|
||||||
|
fcx.infcx().ty_to_string(self.cast_ty))
|
||||||
|
}, self.expr_ty, None)
|
||||||
|
}
|
||||||
CastError::DifferingKinds => {
|
CastError::DifferingKinds => {
|
||||||
fcx.type_error_struct(self.span, |actual| {
|
fcx.type_error_struct(self.span, |actual| {
|
||||||
format!("casting `{}` as `{}` is invalid",
|
format!("casting `{}` as `{}` is invalid",
|
||||||
|
@ -312,7 +321,7 @@ impl<'tcx> CastCheck<'tcx> {
|
||||||
|
|
||||||
// sized -> unsized? report invalid cast (don't complain about vtable kinds)
|
// sized -> unsized? report invalid cast (don't complain about vtable kinds)
|
||||||
if fcx.type_is_known_to_be_sized(m_expr.ty, self.span) {
|
if fcx.type_is_known_to_be_sized(m_expr.ty, self.span) {
|
||||||
return Err(CastError::IllegalCast);
|
return Err(CastError::SizedUnsizedCast);
|
||||||
}
|
}
|
||||||
|
|
||||||
// vtable kinds must match
|
// vtable kinds must match
|
||||||
|
|
|
@ -87,7 +87,7 @@ fn main()
|
||||||
//~^^ HELP through a usize first
|
//~^^ HELP through a usize first
|
||||||
|
|
||||||
let _ = 42usize as *const [u8]; //~ ERROR casting
|
let _ = 42usize as *const [u8]; //~ ERROR casting
|
||||||
let _ = v as *const [u8]; //~ ERROR casting
|
let _ = v as *const [u8]; //~ ERROR cannot cast
|
||||||
let _ = fat_v as *const Foo;
|
let _ = fat_v as *const Foo;
|
||||||
//~^ ERROR `core::marker::Sized` is not implemented for the type `[u8]`
|
//~^ ERROR `core::marker::Sized` is not implemented for the type `[u8]`
|
||||||
let _ = foo as *const str; //~ ERROR casting
|
let _ = foo as *const str; //~ ERROR casting
|
||||||
|
|
|
@ -24,7 +24,7 @@ fn main() {
|
||||||
//~^^ HELP cast through a thin pointer
|
//~^^ HELP cast through a thin pointer
|
||||||
|
|
||||||
// #22955
|
// #22955
|
||||||
q as *const [i32]; //~ ERROR casting
|
q as *const [i32]; //~ ERROR cannot cast
|
||||||
|
|
||||||
// #21397
|
// #21397
|
||||||
let t: *mut (Trait + 'static) = 0 as *mut _; //~ ERROR casting
|
let t: *mut (Trait + 'static) = 0 as *mut _; //~ ERROR casting
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
fn cast_thin_to_fat(x: *const ()) {
|
||||||
|
x as *const [u8];
|
||||||
|
//~^ ERROR: cannot cast thin pointer `*const ()` to fat pointer `*const [u8]`
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Reference in New Issue