---

yaml
---
r: 219574
b: refs/heads/snap-stage3
c: 079bfad
h: refs/heads/master
v: v3

Author: Nick Hamann

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 009e53d70f722bcd8faf474c48c43d57b51f3b29
+refs/heads/snap-stage3: 079bfad72d1ec329a5ecdb134960777ae4320303
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/configure

@@ -899,18 +899,6 @@ then
     fi
 fi
 
-# If the clang isn't already enabled, check for GCC, and if it is missing, turn
-# on clang as a backup.
-if [ -z "$CFG_ENABLE_CLANG" ]
-then
-  CFG_GCC_VERSION=$("$CFG_GCC" --version 2>&1)
-  if [ $? -ne 0 ]
-  then
-    step_msg "GCC not installed, will try using Clang"
-    CFG_ENABLE_CLANG=1
-  fi
-fi
-
 # Okay, at this point, we have made up our minds about whether we are
 # going to force CFG_ENABLE_CLANG or not; save the setting if so.
 if [ ! -z "$CFG_ENABLE_CLANG" ]
@@ -932,7 +920,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[5-7]*)
+        (3.[5-6]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)

branches/snap-stage3/src/libcollectionstest/lib.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 #![feature(append)]
+#![feature(bit_vec_append_split_off)]
 #![feature(bitset)]
 #![feature(bitvec)]
 #![feature(box_syntax)]

branches/snap-stage3/src/liblibc/lib.rs

@@ -3600,11 +3600,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         #[cfg(any(target_arch = "mips",
                   target_arch = "mipsel"))]
@@ -3689,11 +3684,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         #[cfg(any(target_arch = "x86",
                   target_arch = "x86_64",
@@ -4237,11 +4227,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -4666,11 +4651,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -5112,11 +5092,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -6146,7 +6121,6 @@ pub mod funcs {
                            -> c_int;
             pub fn realpath(pathname: *const c_char, resolved: *mut c_char)
                             -> *mut c_char;
-            pub fn flock(fd: c_int, operation: c_int) -> c_int;
         }
     }
 
@@ -6163,7 +6137,6 @@ pub mod funcs {
                            -> c_int;
             pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar)
                            -> c_int;
-            pub fn flock(fd: c_int, operation: c_int) -> c_int;
         }
     }
 

branches/snap-stage3/src/test/run-pass/issue-22375.rs renamed to branches/snap-stage3/src/test/compile-fail/issue-19538.rs

@@ -8,6 +8,22 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-trait A<T: A<T>> {}
+trait Foo {
+    fn foo<T>(&self, val: T);
+}
 
-fn main() {}
+trait Bar: Foo { }
+
+pub struct Thing;
+
+impl Foo for Thing {
+    fn foo<T>(&self, val: T) { }
+}
+
+impl Bar for Thing { }
+
+fn main() {
+    let mut thing = Thing;
+    let test: &mut Bar = &mut thing;
+    //~^ ERROR cannot convert to a trait object because trait `Bar` is not object-safe
+}