Auto merge of rust-lang#27596 - tsion:fix-27450, r=arielb1

Fixes rust-lang#27450. r? @steveklabnik
l0kod · Aug 8, 2015 · 920cf4b · 920cf4b
2 parents e5d90d9 + f351e76
commit 920cf4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs
@@ -100,6 +100,7 @@ enum CastError {
  DifferingKinds,
  IllegalCast,
  NeedViaPtr,
+ NeedViaThinPtr,
  NeedViaInt,
  NeedViaUsize,
  NonScalar,
@@ -120,6 +121,7 @@ impl<'tcx> CastCheck<'tcx> {
  e: CastError) {
  match e {
  CastError::NeedViaPtr |
+ CastError::NeedViaThinPtr |
  CastError::NeedViaInt |
  CastError::NeedViaUsize => {
  fcx.type_error_message(self.span, |actual| {
@@ -130,6 +132,7 @@ impl<'tcx> CastCheck<'tcx> {
  fcx.ccx.tcx.sess.fileline_help(self.span,
  &format!("cast through {} first", match e {
  CastError::NeedViaPtr => "a raw pointer",
+ CastError::NeedViaThinPtr => "a thin pointer",
  CastError::NeedViaInt => "an integer",
  CastError::NeedViaUsize => "a usize",
  _ => unreachable!()
@@ -324,7 +327,7 @@ impl<'tcx> CastCheck<'tcx> {
  if fcx.type_is_known_to_be_sized(m_expr.ty, self.span) {
  Ok(CastKind::PtrAddrCast)
  } else {
- Err(CastError::NeedViaPtr)
+ Err(CastError::NeedViaThinPtr)
  }
  }
 

diff --git a/src/test/compile-fail/cast-rfc0401.rs b/src/test/compile-fail/cast-rfc0401.rs
@@ -96,7 +96,7 @@ fn main()
  let _ = &f as *const f64; //~ ERROR casting
  let _ = fat_v as usize;
  //~^ ERROR casting
- //~^^ HELP through a raw pointer first
+ //~^^ HELP through a thin pointer first
 
  let a : *const str = "hello";
  let _ = a as *const Foo;

diff --git a/src/test/compile-fail/fat-ptr-cast.rs b/src/test/compile-fail/fat-ptr-cast.rs
@@ -21,7 +21,7 @@ fn main() {
  b as usize; //~ ERROR non-scalar cast
  p as usize;
  //~^ ERROR casting
- //~^^ HELP cast through a raw pointer
+ //~^^ HELP cast through a thin pointer
 
  // #22955
  q as *const [i32]; //~ ERROR casting