---

yaml
---
r: 236541
b: refs/heads/tmp
c: 0b13ee0
h: refs/heads/master
i:
  236539: cd500bd
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: e314ac601aa87c6b7958cec1199d646a1f7f2691
+refs/heads/tmp: 0b13ee0ced39db0acaf1bb966e57417bd42b0423
 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/grammar.md

@@ -9,7 +9,7 @@ provides only one kind of material:
 
 This document does not serve as an introduction to the language. Background
 familiarity with the language is assumed. A separate [guide] is available to
-help acquire such background.
+help acquire such background familiarity.
 
 This document also does not serve as a reference to the [standard] library
 included in the language distribution. Those libraries are documented

branches/tmp/src/doc/reference.md

@@ -674,7 +674,7 @@ There are several kinds of item:
 * [modules](#modules)
 * [functions](#functions)
 * [type definitions](grammar.html#type-definitions)
-* [structures](#structures)
+* [structs](#structs)
 * [enumerations](#enumerations)
 * [constant items](#constant-items)
 * [static items](#static-items)
@@ -900,10 +900,9 @@ fn main() {}
 
 ### Functions
 
-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
+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
 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.
@@ -922,7 +921,7 @@ An example of a function:
 
 ```
 fn add(x: i32, y: i32) -> i32 {
-    x + y
+    return x + y;
 }
 ```
 
@@ -1156,7 +1155,7 @@ type Point = (u8, u8);
 let p: Point = (41, 68);
 ```
 
-### Structures
+### Structs
 
 A _structure_ is a nominal [structure type](#structure-types) defined with the
 keyword `struct`.
@@ -2615,21 +2614,21 @@ comma:
 ### Structure expressions
 
 There are several forms of structure expressions. A _structure expression_
-consists of the [path](#paths) of a [structure item](#structures), followed by
+consists of the [path](#paths) of a [structure item](#structs), followed by
 a brace-enclosed list of one or more comma-separated name-value pairs,
 providing the field values of a new instance of the structure. A field name
 can be any identifier, and is separated from its value expression by a colon.
 The location denoted by a structure field is mutable if and only if the
 enclosing structure is mutable.
 
 A _tuple structure expression_ consists of the [path](#paths) of a [structure
-item](#structures), followed by a parenthesized list of one or more
+item](#structs), followed by a parenthesized list of one or more
 comma-separated expressions (in other words, the path of a structure item
 followed by a tuple expression). The structure item must be a tuple structure
 item.
 
 A _unit-like structure expression_ consists only of the [path](#paths) of a
-[structure item](#structures).
+[structure item](#structs).
 
 The following are examples of structure expressions:
 
@@ -3146,7 +3145,7 @@ if` condition is evaluated. If all `if` and `else if` conditions evaluate to
 
 A `match` expression branches on a *pattern*. The exact form of matching that
 occurs depends on the pattern. Patterns consist of some combination of
-literals, destructured arrays or enum constructors, structures and tuples,
+literals, destructured arrays or enum constructors, structs and tuples,
 variable binding specifications, wildcards (`..`), and placeholders (`_`). A
 `match` expression has a *head expression*, which is the value to compare to
 the patterns. The type of the patterns must equal the type of the head
@@ -3470,7 +3469,7 @@ named reference to an [`enum` item](#enumerations).
 ### Recursive types
 
 Nominal types — [enumerations](#enumerated-types) and
-[structures](#structure-types) — may be recursive. That is, each `enum`
+[structs](#structure-types) — may be recursive. That is, each `enum`
 constructor or `struct` field may refer, directly or indirectly, to the
 enclosing `enum` or `struct` type itself. Such recursion has restrictions:
 
@@ -3498,7 +3497,7 @@ let a: List<i32> = List::Cons(7, Box::new(List::Cons(13, Box::new(List::Nil))));
 ### Pointer types
 
 All pointers in Rust are explicit first-class values. They can be copied,
-stored into data structures, and returned from functions. There are two
+stored into data structs, and returned from functions. There are two
 varieties of pointer in Rust:
 
 * References (`&`)
@@ -3898,7 +3897,7 @@ references to boxes are dropped.
 ### Variables
 
 A _variable_ is a component of a stack frame, either a named function parameter,
-an anonymous [temporary](#lvalues-rvalues-and-temporaries), or a named local
+an anonymous [temporary](#lvalues,-rvalues-and-temporaries), or a named local
 variable.
 
 A _local variable_ (or *stack-local* allocation) holds a value directly,
@@ -4037,6 +4036,10 @@ In general, `--crate-type=bin` or `--crate-type=lib` should be sufficient for
 all compilation needs, and the other options are just available if more
 fine-grained control is desired over the output format of a Rust crate.
 
+# Appendix: Rationales and design trade-offs
+
+*TODO*.
+
 # Appendix: Influences
 
 Rust is not a particularly original language, with design elements coming from

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