---

yaml
---
r: 208223
b: refs/heads/snap-stage3
c: 14d476e
h: refs/heads/master
i:
  208221: 835b95a
  208219: 3ce4f6f
  208215: ed49e3a
  208207: 33e1d14
  208191: 37ee328
v: v3

Author: carols10cents

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 79ca74d8e31897b79934a77cd6733fe5f42eb3dc
+refs/heads/snap-stage3: 14d476ecbb502d2d085c101b0c41e8e51ca5b4cf
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/doc/trpl/error-handling.md

@@ -214,7 +214,7 @@ we can use the `unwrap()` method:
 io::stdin().read_line(&mut buffer).unwrap();
 ```
 
-`unwrap()` will `panic!` if the `Result` is `Err`. This basically says "Give
+`unwrap()` will `panic!` if the `Option` is `None`. This basically says "Give
 me the value, and if something goes wrong, just crash." This is less reliable
 than matching the error and attempting to recover, but is also significantly
 shorter. Sometimes, just crashing is appropriate.

branches/snap-stage3/src/librustc/diagnostics.rs

@@ -271,12 +271,6 @@ fn main() {
 See also http://doc.rust-lang.org/book/unsafe.html
 "##,
 
-E0137: r##"
-This error indicates that the compiler found multiple functions with the
-#[main] attribute. This is an error because there must be a unique entry point
-into a Rust program.
-"##,
-
 E0152: r##"
 Lang items are already implemented in the standard library. Unless you are
 writing a free-standing application (e.g. a kernel), you do not need to provide
@@ -425,142 +419,6 @@ of a loop. Without a loop to break out of or continue in, no sensible action can
 be taken.
 "##,
 
-E0271: r##"
-This is because of a type mismatch between the associated type of some
-trait (e.g. T::Bar, where T implements trait Quux { type Bar; })
-and another type U that is required to be equal to T::Bar, but is not.
-Examples follow.
-
-Here is a basic example:
-
-```
-trait Trait { type AssociatedType; }
-fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
-    println!("in foo");
-}
-impl Trait for i8 { type AssociatedType = &'static str; }
-foo(3_i8);
-```
-
-Here is that same example again, with some explanatory comments:
-
-```
-trait Trait { type AssociatedType; }
-
-fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
-//                    ~~~~~~~~ ~~~~~~~~~~~~~~~~~~
-//                        |            |
-//         This says `foo` can         |
-//           only be used with         |
-//              some type that         |
-//         implements `Trait`.         |
-//                                     |
-//                             This says not only must
-//                             `T` be an impl of `Trait`
-//                             but also that the impl
-//                             must assign the type `u32`
-//                             to the associated type.
-    println!("in foo");
-}
-
-impl Trait for i8 { type AssociatedType = &'static str; }
-~~~~~~~~~~~~~~~~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//      |                             |
-// `i8` does have                     |
-// implementation                     |
-// of `Trait`...                      |
-//                     ... but it is an implementation
-//                     that assigns `&'static str` to
-//                     the associated type.
-
-foo(3_i8);
-// Here, we invoke `foo` with an `i8`, which does not satisfy
-// the constraint `<i8 as Trait>::AssociatedType=32`, and
-// therefore the type-checker complains with this error code.
-```
-
-Here is a more subtle instance of the same problem, that can
-arise with for-loops in Rust:
-
-```
-let vs: Vec<i32> = vec![1, 2, 3, 4];
-for v in &vs {
-    match v {
-        1 => {}
-        _ => {}
-    }
-}
-```
-
-The above fails because of an analogous type mismatch,
-though may be harder to see. Again, here are some
-explanatory comments for the same example:
-
-```
-{
-    let vs = vec![1, 2, 3, 4];
-
-    // `for`-loops use a protocol based on the `Iterator`
-    // trait. Each item yielded in a `for` loop has the
-    // type `Iterator::Item` -- that is,I `Item` is the
-    // associated type of the concrete iterator impl.
-    for v in &vs {
-//      ~    ~~~
-//      |     |
-//      |    We borrow `vs`, iterating over a sequence of
-//      |    *references* of type `&Elem` (where `Elem` is
-//      |    vector's element type). Thus, the associated
-//      |    type `Item` must be a reference `&`-type ...
-//      |
-//  ... and `v` has the type `Iterator::Item`, as dictated by
-//  the `for`-loop protocol ...
-
-        match v {
-            1 => {}
-//          ~
-//          |
-// ... but *here*, `v` is forced to have some integral type;
-// only types like `u8`,`i8`,`u16`,`i16`, et cetera can
-// match the pattern `1` ...
-
-            _ => {}
-        }
-
-// ... therefore, the compiler complains, because it sees
-// an attempt to solve the equations
-// `some integral-type` = type-of-`v`
-//                      = `Iterator::Item`
-//                      = `&Elem` (i.e. `some reference type`)
-//
-// which cannot possibly all be true.
-
-    }
-}
-```
-
-To avoid those issues, you have to make the types match correctly.
-So we can fix the previous examples like this:
-
-```
-// Basic Example:
-trait Trait { type AssociatedType; }
-fn foo<T>(t: T) where T: Trait<AssociatedType = &'static str> {
-    println!("in foo");
-}
-impl Trait for i8 { type AssociatedType = &'static str; }
-foo(3_i8);
-
-// For-Loop Example:
-let vs = vec![1, 2, 3, 4];
-for v in &vs {
-    match v {
-        &1 => {}
-        _ => {}
-    }
-}
-```
-"##,
-
 E0282: r##"
 This error indicates that type inference did not result in one unique possible
 type, and extra information is required. In most cases this can be provided
@@ -806,6 +664,7 @@ register_diagnostics! {
     E0134,
     E0135,
     E0136,
+    E0137,
     E0138,
     E0139,
     E0261, // use of undeclared lifetime name
@@ -815,6 +674,7 @@ register_diagnostics! {
     E0266, // expected item
     E0269, // not all control paths return a value
     E0270, // computation may converge in a function marked as diverging
+    E0271, // type mismatch resolving
     E0272, // rustc_on_unimplemented attribute refers to non-existent type parameter
     E0273, // rustc_on_unimplemented must have named format arguments
     E0274, // rustc_on_unimplemented must have a value

branches/snap-stage3/src/librustc_typeck/diagnostics.rs

@@ -34,18 +34,6 @@ let x_is_nonzero = x as bool;
 ```
 "##,
 
-E0062: r##"
-This error indicates that during an attempt to build a struct or struct-like
-enum variant, one of the fields was specified more than once. Each field should
-be specified exactly one time.
-"##,
-
-E0063: r##"
-This error indicates that during an attempt to build a struct or struct-like
-enum variant, one of the fields was not provided. Each field should be specified
-exactly once.
-"##,
-
 E0081: r##"
 Enum discriminants are used to differentiate enum variants stored in memory.
 This error indicates that the same value was used for two or more variants,
@@ -148,6 +136,8 @@ register_diagnostics! {
     E0059,
     E0060,
     E0061,
+    E0062,
+    E0063,
     E0066,
     E0067,
     E0068,