---

yaml
---
r: 226165
b: refs/heads/tmp
c: f351e76
h: refs/heads/master
i:
  226163: b284e21
v: v3

Author: solson

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: 83dee3dfbb452a7558193f3ce171b3c60bf4a499
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
+refs/heads/tmp: f351e762f0af1cce5068850e9bd21c54f7cb15f2
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/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)
         }
     }
 

branches/tmp/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;

branches/tmp/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