---

yaml
---
r: 236287
b: refs/heads/master
c: 996bd9d
h: refs/heads/master
i:
  236285: 73ab1ef
  236283: dd5003b
  236279: 30ea23b
  236271: 1438607
  236255: b984ad9
  236223: 72cd59b
  236159: 61b581b
  236031: fc5c0b8
v: v3

Author: tshepang

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6f0a095d0509d19d1ffabaa41f779470807dc1f2
+refs/heads/master: 996bd9d0d6b7887e4720d5a595ce9fd2c6a82c80
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
 refs/heads/try: ea3892f76a2180dd4ce724f1dafd9186959702d9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/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

trunk/src/doc/reference.md

@@ -900,9 +900,10 @@ fn main() {}
 
 ### Functions
 
-A _function item_ defines a sequence of [statements](#statements) and an
-optional final [expression](#expressions), along with a name and a set of
-parameters. Functions are declared with the keyword `fn`. Functions declare a
+A _function item_ defines a sequence of [statements](#statements) and a
+final [expression](#expressions), along with a name and a set of
+parameters. Other than a name, all these are optional.
+Functions are declared with the keyword `fn`. Functions may declare a
 set of *input* [*variables*](#variables) as parameters, through which the caller
 passes arguments into the function, and the *output* [*type*](#types)
 of the value the function will return to its caller on completion.
@@ -921,7 +922,7 @@ An example of a function:
 
 ```
 fn add(x: i32, y: i32) -> i32 {
-    x + y
+    return x + y;
 }
 ```
 

trunk/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
     ///

trunk/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;

trunk/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);
       }

trunk/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++