---

yaml
---
r: 219039
b: refs/heads/snap-stage3
c: 2442f83
h: refs/heads/master
i:
  219037: b46bf4a
  219035: 40a4317
  219031: cf298fd
  219023: 38c241f
  219007: bb14821
v: v3

Author: eefriedman

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 02c33b690b9270ef7d26412fdf4a8498acfea1a7
+refs/heads/snap-stage3: 2442f830cbe6317a9376a04ea4486923e32e4dd4
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/AUTHORS.txt

@@ -338,7 +338,7 @@ Hajime Morrita <[email protected]>
 Hanno Braun <[email protected]>
 Harry Marr <[email protected]>
 Heather <[email protected]>
-Heejong Ahn <[email protected]>
+Heejong Ahn <[email protected]
 Henrik Schopmans <[email protected]>
 Herman J. Radtke III <[email protected]>
 HeroesGrave <[email protected]>

branches/snap-stage3/configure

@@ -1307,12 +1307,6 @@ CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
 for t in $CFG_HOST
 do
     do_reconfigure=1
-    is_msvc=0
-    case "$t" in
-        (*-msvc)
-        is_msvc=1
-        ;;
-    esac
 
     if [ -z $CFG_LLVM_ROOT ]
     then
@@ -1332,13 +1326,7 @@ do
             LLVM_ASSERTION_OPTS="--disable-assertions"
         else
             LLVM_ASSERTION_OPTS="--enable-assertions"
-
-            # Apparently even if we request assertions be enabled for MSVC,
-            # LLVM's CMake build system ignore this and outputs in `Release`
-            # anyway.
-            if [ ${is_msvc} -eq 0 ]; then
-                LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
-            fi
+            LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
         fi
     else
         msg "not reconfiguring LLVM, external LLVM root"
@@ -1368,7 +1356,14 @@ do
         done
     fi
 
-    if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
+    use_cmake=0
+    case "$t" in
+        (*-msvc)
+        use_cmake=1
+        ;;
+    esac
+
+    if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -ne 0 ]
     then
         msg "configuring LLVM for $t with cmake"
 
@@ -1393,7 +1388,7 @@ do
         need_ok "LLVM cmake configure failed"
     fi
 
-    if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -eq 0 ]
+    if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -eq 0 ]
     then
         # LLVM's configure doesn't recognize the new Windows triples yet
         gnu_t=$(to_gnu_triple $t)

branches/snap-stage3/src/compiletest/runtest.rs

@@ -24,6 +24,7 @@ use std::fmt;
 use std::fs::{self, File};
 use std::io::BufReader;
 use std::io::prelude::*;
+use std::iter::repeat;
 use std::net::TcpStream;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output, ExitStatus};
@@ -651,7 +652,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
 
     // Write debugger script:
     // We don't want to hang when calling `quit` while the process is still running
-    let mut script_str = String::from("settings set auto-confirm true\n");
+    let mut script_str = String::from_str("settings set auto-confirm true\n");
 
     // Make LLDB emit its version, so we have it documented in the test output
     script_str.push_str("version\n");
@@ -927,12 +928,12 @@ fn check_forbid_output(props: &TestProps,
     }
 }
 
-fn check_expected_errors(expected_errors: Vec<errors::ExpectedError>,
+fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
                          testfile: &Path,
                          proc_res: &ProcRes) {
 
     // true if we found the error in question
-    let mut found_flags = vec![false; expected_errors.len()];
+    let mut found_flags: Vec<_> = repeat(false).take(expected_errors.len()).collect();
 
     if proc_res.status.success() {
         fatal("process did not return an error status");
@@ -953,10 +954,14 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError>,
         }
     }
 
-    // A multi-line error will have followup lines which start with a space
-    // or open paren.
+    // A multi-line error will have followup lines which will always
+    // start with one of these strings.
     fn continuation( line: &str) -> bool {
-        line.starts_with(" ") || line.starts_with("(")
+        line.starts_with(" expected") ||
+        line.starts_with("    found") ||
+        //                1234
+        // Should have 4 spaces: see issue 18946
+        line.starts_with("(")
     }
 
     // Scan and extract our error/warning messages,

branches/snap-stage3/src/doc/index.md

@@ -25,7 +25,7 @@ series of small examples.
 If you need help with something, or just want to talk about Rust with others,
 there are a few places you can do that:
 
-The Rust IRC channels on [irc.mozilla.org](irc://irc.mozilla.org/) are the
+The Rust IRC channels on [irc.mozilla.org](http://irc.mozilla.org/) are the
 fastest way to get help.
 [`#rust`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) is
 the general discussion channel, and you'll find people willing to help you with
@@ -40,15 +40,15 @@ There's also
 [`#rust-internals`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals), which is for discussion of the development of Rust itself.
 
 You can also get help on [Stack
-Overflow](https://stackoverflow.com/questions/tagged/rust). Searching for your
+Overflow](http://stackoverflow.com/questions/tagged/rust). Searching for your
 problem might reveal someone who has asked it before!
 
-There is an active [subreddit](https://reddit.com/r/rust) with lots of
+There is an active [subreddit](http://reddit.com/r/rust) with lots of
 discussion and news about Rust.
 
-There is also a [user forum](https://users.rust-lang.org), for all
-user-oriented discussion, and a [developer 
-forum](https://internals.rust-lang.org/), where the development of Rust
+There is also a [user forum](http://users.rust-lang.org), for all
+user-oriented discussion, and a [developer
+forum](http://internals.rust-lang.org/), where the development of Rust
 itself is discussed.
 
 # Specification
@@ -61,7 +61,7 @@ the language in as much detail as possible is in [the reference](reference.html)
 Rust is still a young language, so there isn't a ton of tooling yet, but the
 tools we have are really nice.
 
-[Cargo](https://crates.io) is Rust's package manager, and its website contains
+[Cargo](http://crates.io) is Rust's package manager, and its website contains
 lots of good documentation.
 
 [`rustdoc`](book/documentation.html) is used to generate documentation for Rust code.

branches/snap-stage3/src/doc/reference.md

@@ -3599,147 +3599,6 @@ The notation `&self` is a shorthand for `self: &Self`. In this case,
 in the impl, `Self` refers to the value of type `String` that is the
 receiver for a call to the method `make_string`.
 
-## Subtyping
-
-Subtyping is implicit and can occur at any stage in type checking or
-inference. Subtyping in Rust is very restricted and occurs only due to
-variance with respect to lifetimes and between types with higher ranked
-lifetimes. If we were to erase lifetimes from types, then the only subtyping
-would be due to type equality.
-
-Consider the following example: string literals always have `'static`
-lifetime. Nevertheless, we can assign `s` to `t`:
-
-```
-fn bar<'a>() {
-    let s: &'static str = "hi";
-    let t: &'a str = s;
-}
-```
-Since `'static` "lives longer" than `'a`, `&'static str` is a subtype of
-`&'a str`.
-
-## Type coercions
-
-Coercions are defined in [RFC401]. A coercion is implicit and has no syntax.
-
-[RFC401]: https://github.com/rust-lang/rfcs/blob/master/text/0401-coercions.md
-
-### Coercion sites
-
-A coercion can only occur at certain coercion sites in a program; these are
-typically places where the desired type is explicit or can be dervied by
-propagation from explicit types (without type inference). Possible coercion
-sites are:
-
-* `let` statements where an explicit type is given.
-
-    In `let _: U = e;`, `e` is coerced to have type `U`.
-
-* `static` and `const` statements (similar to `let` statements).
-
-* arguments for function calls.
-
-    The value being coerced is the
-    actual parameter and it is coerced to the type of the formal parameter. For
-    example, let `foo` be defined as `fn foo(x: U) { ... }` and call it as
-    `foo(e);`. Then `e` is coerced to have type `U`;
-
-* instantiations of struct or variant fields.
-
-    Assume we have a `struct
-    Foo { x: U }` and instantiate it as `Foo { x: e }`. Then `e` is coerced to
-    have type `U`.
-
-* function results (either the final line of a block if it is not semicolon
-terminated or any expression in a `return` statement).
-
-    In `fn foo() -> U { e }`, `e` is coerced to to have type `U`.
-
-If the expression in one of these coercion sites is a coercion-propagating
-expression, then the relevant sub-expressions in that expression are also
-coercion sites. Propagation recurses from these new coercion sites.
-Propagating expressions and their relevant sub-expressions are:
-
-* array literals, where the array has type `[U; n]`. Each sub-expression in
-the array literal is a coercion site for coercion to type `U`.
-
-* array literals with repeating syntax, where the array has type `[U; n]`. The
-repeated sub-expression is a coercion site for coercion to type `U`.
-
-* tuples, where a tuple is a coercion site to type `(U_0, U_1, ..., U_n)`.
-Each sub-expression is a coercion site to the respective type, e.g. the
-zeroth sub-expression is a coercion site to type `U_0`.
-
-* parenthesised sub-expressions (`(e)`). If the expression has type `U`, then
-the sub-expression is a coercion site to `U`.
-
-* blocks. If a block has type `U`, then the last expression in the block (if
-it is not semicolon-terminated) is a coercion site to `U`. This includes
-blocks which are part of control flow statements, such as `if`/`else`, if
-the block has a known type.
-
-### Coercion types
-
-Coercion is allowed between the following types:
-
-* `T` to `U` if `T` is a subtype of `U` (*reflexive case*).
-
-* `T_1` to `T_3` where `T_1` coerces to `T_2` and `T_2` coerces to `T_3`
-(*transitive case*).
-
-    Note that this is not fully supported yet
-
-* `&mut T` to `&T`.
-
-* `*mut T` to `*const T`.
-
-* `&T` to `*const T`.
-
-* `&mut T` to `*mut T`.
-
-* `&T` to `&U` if `T` implements `Deref<Target = U>`. For example:
-
-```rust
-use std::ops::Deref;
-
-struct CharContainer {
-    value: char
-}
-
-impl Deref for CharContainer {
-    type Target = char;
-
-    fn deref<'a>(&'a self) -> &'a char {
-        &self.value
-    }
-}
-
-fn foo(arg: &char) {}
-
-fn main() {
-    let x = &mut CharContainer { value: 'y' };
-    foo(x); //&mut CharContainer is coerced to &char.
-}
-```
-* `&mut T` to `&mut U` if `T` implements `DerefMut<Target = U>`.
-
-* TyCtor(`T`) to TyCtor(coerce_inner(`T`)), where TyCtor(`T`) is one of
-    - `&T`
-    - `&mut T`
-    - `*const T`
-    - `*mut T`
-    - `Box<T>`
-
-    and where
-    - coerce_inner(`[T, ..n]`) = `[T]`
-    - coerce_inner(`T`) = `U` where `T` is a concrete type which implements the
-    trait `U`.
-
-    In the future, coerce_inner will be recursively extended to tuples and
-    structs. In addition, coercions from sub-traits to super-traits will be
-    added. See [RFC401] for more details.
-
 # Special traits
 
 Several traits define special evaluation behavior.

branches/snap-stage3/src/doc/trpl/for-loops.md

@@ -41,45 +41,3 @@ so our loop will print `0` through `9`, not `10`.
 Rust does not have the “C-style” `for` loop on purpose. Manually controlling
 each element of the loop is complicated and error prone, even for experienced C
 developers.
-
-# Enumerate
-
-When you need to keep track of how many times you already looped, you can use the `.enumerate()` function.
-
-## On ranges:
-
-```rust
-for (i,j) in (5..10).enumerate() {
-    println!("i = {} and j = {}", i, j);
-}
-```
-
-Outputs:
-
-```text
-i = 0 and j = 5
-i = 1 and j = 6
-i = 2 and j = 7
-i = 3 and j = 8
-i = 4 and j = 9
-```
-
-Don't forget to add the parentheses around the range.
-
-## On iterators:
-
-```rust
-# let lines = "hello\nworld".lines();
-for (linenumber, line) in lines.enumerate() {
-    println!("{}: {}", linenumber, line);
-}
-```
-
-Outputs:
-
-```text
-0: Content of line one
-1: Content of line two
-2: Content of line tree
-3: Content of line four
-```