---

yaml
---
r: 212186
b: refs/heads/tmp
c: 9634bcb
h: refs/heads/master
v: v3

Author: carols10cents

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 62e70d35be3fe532c26a400b499c58a18f18dd3a
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 5421b1fa25108a5100faa772840202f304293e0f
+refs/heads/tmp: 9634bcbd3d120e7a13b62bb47e882fc9ce6338cd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: b77d60adb019bb5de05e884a99f3290ec4694137
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/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};
@@ -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/tmp/src/doc/reference.md

@@ -1943,6 +1943,9 @@ macro scope.
 - `simd` - on certain tuple structs, derive the arithmetic operators, which
   lower to the target's SIMD instructions, if any; the `simd` feature gate
   is necessary to use this attribute.
+- `static_assert` - on statics whose type is `bool`, terminates compilation
+  with an error if it is not initialized to `true`. To use this, the `static_assert`
+  feature gate must be enabled.
 - `unsafe_no_drop_flag` - on structs, remove the flag that prevents
   destructors from being run twice. Destructors might be run multiple times on
   the same object with this attribute. To use this, the `unsafe_no_drop_flag` feature
@@ -2298,6 +2301,12 @@ The currently implemented features of the reference compiler are:
                  crate. Stability markers are also attributes: `#[stable]`,
                  `#[unstable]`, and `#[deprecated]` are the three levels.
 
+* `static_assert` - The `#[static_assert]` functionality is experimental and
+                    unstable. The attribute can be attached to a `static` of
+                    type `bool` and the compiler will error if the `bool` is
+                    `false` at compile time. This version of this functionality
+                    is unintuitive and suboptimal.
+
 * `start` - Allows use of the `#[start]` attribute, which changes the entry point
             into a Rust program. This capability, especially the signature for the
             annotated function, is subject to change.
@@ -3599,146 +3608,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:
-    ```
-    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/tmp/src/libcore/result.rs

@@ -223,7 +223,9 @@
 //! }
 //! ```
 //!
-//! `try!` is imported by the prelude, and is available everywhere.
+//! `try!` is imported by the prelude and is available everywhere, but it can only
+//! be used in functions that return `Result` because of the early return of
+//! `Err` that it provides.
 
 #![stable(feature = "rust1", since = "1.0.0")]