---

yaml
---
r: 206336
b: refs/heads/beta
c: 0d7d3ec
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: df18642b1ad80369cefc0cbe626e5b0096654938
+refs/heads/beta: 0d7d3ec9d2b314af0188a820c58fbd95ee905793
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/doc/trpl/concurrency.md

@@ -116,7 +116,7 @@ use std::thread;
 fn main() {
     let mut data = vec![1u32, 2, 3];
 
-    for i in 0..2 {
+    for i in 0..3 {
         thread::spawn(move || {
             data[i] += 1;
         });
@@ -154,7 +154,7 @@ use std::sync::Mutex;
 fn main() {
     let mut data = Mutex::new(vec![1u32, 2, 3]);
 
-    for i in 0..2 {
+    for i in 0..3 {
         let data = data.lock().unwrap();
         thread::spawn(move || {
             data[i] += 1;
@@ -196,7 +196,7 @@ use std::thread;
 fn main() {
     let data = Arc::new(Mutex::new(vec![1u32, 2, 3]));
 
-    for i in 0..2 {
+    for i in 0..3 {
         let data = data.clone();
         thread::spawn(move || {
             let mut data = data.lock().unwrap();
@@ -217,7 +217,7 @@ thread more closely:
 # use std::thread;
 # fn main() {
 #     let data = Arc::new(Mutex::new(vec![1u32, 2, 3]));
-#     for i in 0..2 {
+#     for i in 0..3 {
 #         let data = data.clone();
 thread::spawn(move || {
     let mut data = data.lock().unwrap();

branches/beta/src/liblog/macros.rs

@@ -136,7 +136,7 @@ macro_rules! info {
 }
 
 /// A convenience macro for logging at the debug log level. This macro can also
-/// be omitted at compile time by passing `--cfg ndebug` to the compiler. If
+/// be omitted at compile time by passing `-C debug-assertions` to the compiler. If
 /// this option is not passed, then debug statements will be compiled.
 ///
 /// # Examples

branches/beta/src/librustc_typeck/check/cast.rs

@@ -170,9 +170,10 @@ pub fn check_cast<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, cast: &CastCheck<'tcx>) {
                 demand::coerce(fcx, e.span, t_1, &e);
             }
         }
-    } else if fcx.type_is_fat_ptr(t_e, span) && !fcx.type_is_fat_ptr(t_1, span) {
+    } else if fcx.type_is_fat_ptr(t_e, span) != fcx.type_is_fat_ptr(t_1, span) {
         fcx.type_error_message(span, |actual| {
-            format!("illegal cast; cast from fat pointer: `{}` as `{}`",
+            format!("illegal cast; cast to or from fat pointer: `{}` as `{}` \
+                     involving incompatible type.",
                     actual, fcx.infcx().ty_to_string(t_1))
         }, t_e, None);
     } else if !(t_e_is_scalar && t_1_is_trivial) {

branches/beta/src/test/compile-fail/fat-ptr-cast.rs

@@ -8,12 +8,24 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Make sure casts between thin pointer <-> fat pointer are illegal.
+
+pub trait Trait {}
+
 fn main() {
     let a: &[i32] = &[1, 2, 3];
     let b: Box<[i32]> = Box::new([1, 2, 3]);
     let p = a as *const [i32];
+    let q = a.as_ptr();
+
+    a as usize; //~ ERROR illegal cast
+    b as usize; //~ ERROR illegal cast
+    p as usize; //~ ERROR illegal cast
+
+    // #22955
+    q as *const [i32]; //~ ERROR illegal cast
 
-    a as usize; //~ ERROR cast from fat pointer
-    b as usize; //~ ERROR cast from fat pointer
-    p as usize; //~ ERROR cast from fat pointer
+    // #21397
+    let t: *mut (Trait + 'static) = 0 as *mut _; //~ ERROR illegal cast
+    let mut fail: *const str = 0 as *const str; //~ ERROR illegal cast
 }

branches/beta/src/test/compile-fail/issue-22034.rs

@@ -11,9 +11,9 @@
 extern crate libc;
 
 fn main() {
-    let foo: *mut libc::c_void;
-    let cb: &mut Fn() = unsafe {
-        &mut *(foo as *mut Fn())
-        //~^ ERROR use of possibly uninitialized variable: `foo`
+    let ptr: *mut () = 0 as *mut _;
+    let _: &mut Fn() = unsafe {
+        &mut *(ptr as *mut Fn())
+        //~^ ERROR illegal cast
     };
 }

branches/beta/src/test/compile-fail/issue-22289.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    0 as &std::any::Any; //~ ERROR non-scalar cast: `i32` as `&core::any::Any`
+    0 as &std::any::Any; //~ ERROR illegal cast
 }