---

yaml
---
r: 236531
b: refs/heads/tmp
c: f34eafd
h: refs/heads/master
i:
  236529: 3f83c7b
  236527: bd589e3
v: v3

Author: tshepang

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 355bbfb8955ffdfb2bb7940ca1b38f2bbb5defd4
+refs/heads/tmp: f34eafdcf9486189f594dc1e38a5b490bcba67ec
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/mk/grammar.mk

@@ -58,17 +58,17 @@ check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
 	$(Q)$(SG)check.sh $(S) "$(BG)" \
 		"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
 else
-$(info cfg: lexer tooling not available, skipping lexer test...)
+$(info cfg: grun not available, skipping lexer test...)
 check-lexer:
 
 endif
 else
-$(info cfg: lexer tooling not available, skipping lexer test...)
+$(info cfg: antlr4 not available, skipping lexer test...)
 check-lexer:
 
 endif
 else
-$(info cfg: lexer tooling not available, skipping lexer test...)
+$(info cfg: javac not available, skipping lexer test...)
 check-lexer:
 
 endif

branches/tmp/src/doc/reference.md

@@ -921,7 +921,7 @@ An example of a function:
 
 ```
 fn add(x: i32, y: i32) -> i32 {
-    return x + y;
+    x + y
 }
 ```
 

branches/tmp/src/libcollections/binary_heap.rs

@@ -167,22 +167,12 @@ use vec::{self, Vec};
 /// item's ordering relative to any other item, as determined by the `Ord`
 /// trait, changes while it is in the heap. This is normally only possible
 /// through `Cell`, `RefCell`, global state, I/O, or unsafe code.
+#[derive(Clone)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct BinaryHeap<T> {
     data: Vec<T>,
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl<T: Clone> Clone for BinaryHeap<T> {
-    fn clone(&self) -> Self {
-        BinaryHeap { data: self.data.clone() }
-    }
-
-    fn clone_from(&mut self, source: &Self) {
-        self.data.clone_from(&source.data);
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T: Ord> Default for BinaryHeap<T> {
     #[inline]

branches/tmp/src/libcollections/lib.rs

@@ -62,7 +62,7 @@
 #![feature(unsafe_no_drop_flag, filling_drop)]
 #![feature(decode_utf16)]
 #![feature(utf8_error)]
-#![cfg_attr(test, feature(clone_from_slice, rand, test))]
+#![cfg_attr(test, feature(rand, test))]
 
 #![feature(no_std)]
 #![no_std]

branches/tmp/src/libcollections/str.rs

@@ -715,7 +715,8 @@ impl str {
     /// Returns `None` if it doesn't exist.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines the
+    /// split.
     ///
     /// # Examples
     ///
@@ -759,7 +760,7 @@ impl str {
     /// Returns `None` if it doesn't exist.
     ///
     /// The pattern can be a simple `&str`, `char`,
-    /// or a closure that determines if a character matches.
+    /// or a closure that determines the split.
     ///
     /// # Examples
     ///
@@ -1095,7 +1096,7 @@ impl str {
     /// An iterator over the matches of a pattern within `self`.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines the split.
     /// Additional libraries might provide more complex patterns like
     /// regular expressions.
     ///
@@ -1128,7 +1129,7 @@ impl str {
     /// reverse order.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines the split.
     /// Additional libraries might provide more complex patterns like
     /// regular expressions.
     ///
@@ -1165,7 +1166,8 @@ impl str {
     /// match are returned.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines
+    /// the split.
     /// Additional libraries might provide more complex patterns like
     /// regular expressions.
     ///
@@ -1212,7 +1214,8 @@ impl str {
     /// match are returned.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines
+    /// the split.
     /// Additional libraries might provide more complex patterns like
     /// regular expressions.
     ///
@@ -1293,7 +1296,7 @@ impl str {
     /// repeatedly removed.
     ///
     /// The pattern can be a simple `char`, or a closure that determines
-    /// if a character matches.
+    /// the split.
     ///
     /// # Examples
     ///
@@ -1323,7 +1326,7 @@ impl str {
     /// repeatedly removed.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines the split.
     ///
     /// # Examples
     ///
@@ -1343,7 +1346,7 @@ impl str {
     /// repeatedly removed.
     ///
     /// The pattern can be a simple `&str`, `char`, or a closure that
-    /// determines if a character matches.
+    /// determines the split.
     ///
     /// # Examples
     ///

branches/tmp/src/libcollections/string.rs

@@ -30,7 +30,7 @@ use vec::Vec;
 use boxed::Box;
 
 /// A growable string stored as a UTF-8 encoded buffer.
-#[derive(PartialOrd, Eq, Ord)]
+#[derive(Clone, PartialOrd, Eq, Ord)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct String {
     vec: Vec<u8>,
@@ -765,17 +765,6 @@ impl fmt::Display for FromUtf16Error {
     }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl Clone for String {
-    fn clone(&self) -> Self {
-        String { vec: self.vec.clone() }
-    }
-
-    fn clone_from(&mut self, source: &Self) {
-        self.vec.clone_from(&source.vec);
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl FromIterator<char> for String {
     fn from_iter<I: IntoIterator<Item=char>>(iterable: I) -> String {

branches/tmp/src/libcollections/vec.rs

@@ -1007,15 +1007,19 @@ impl<T:Clone> Clone for Vec<T> {
 
     fn clone_from(&mut self, other: &Vec<T>) {
         // drop anything in self that will not be overwritten
-        self.truncate(other.len());
-        let len = self.len();
+        if self.len() > other.len() {
+            self.truncate(other.len())
+        }
 
         // reuse the contained values' allocations/resources.
-        self.clone_from_slice(&other[..len]);
+        for (place, thing) in self.iter_mut().zip(other) {
+            place.clone_from(thing)
+        }
 
         // self.len <= other.len due to the truncate above, so the
         // slice here is always in-bounds.
-        self.push_all(&other[len..]);
+        let slice = &other[self.len()..];
+        self.push_all(slice);
     }
 }
 

branches/tmp/src/liblibc/lib.rs

@@ -1683,12 +1683,10 @@ pub mod types {
             pub mod posix01 {
                 use types::common::c95::{c_void};
                 use types::common::c99::{uint32_t, uint64_t};
-                use types::os::arch::c95::{c_long, time_t};
+                use types::os::arch::c95::{c_int, c_uint, c_long, time_t};
                 use types::os::arch::posix88::{dev_t, gid_t};
                 use types::os::arch::posix88::{mode_t, off_t};
                 use types::os::arch::posix88::{uid_t};
-                #[cfg(target_os = "netbsd")]
-                use types::os::arch::c95::{c_int, c_uint};
 
                 pub type nlink_t = uint32_t;
                 pub type blksize_t = uint32_t;

branches/tmp/src/librustc/middle/liveness.rs

@@ -1399,8 +1399,9 @@ fn check_arm(this: &mut Liveness, arm: &hir::Arm) {
 
 fn check_expr(this: &mut Liveness, expr: &Expr) {
     match expr.node {
-      hir::ExprAssign(ref l, _) => {
+      hir::ExprAssign(ref l, ref r) => {
         this.check_lvalue(&**l);
+        this.visit_expr(&**r);
 
         visit::walk_expr(this, expr);
       }

branches/tmp/src/test/compile-fail/issue-22599.rs

@@ -85,11 +85,6 @@ ifeq ($(UNAME),Bitrig)
 else
 ifeq ($(UNAME),OpenBSD)
 	EXTRACFLAGS := -lm -lpthread
-	# extend search lib for found estdc++ if build using gcc from
-	# ports under OpenBSD. This is needed for:
-	#  - run-make/execution-engine
-	#  - run-make/issue-19371
-	RUSTC := $(RUSTC) -L/usr/local/lib
 else
 	EXTRACFLAGS := -lm -lrt -ldl -lpthread
 	EXTRACXXFLAGS := -lstdc++