---

yaml
---
r: 152899
b: refs/heads/try2
c: 5103721
h: refs/heads/master
i:
  152897: 3ac1442
  152895: 38db87d
v: v3

Author: Sawyer47

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b66c59ee5ab63e3573d96568a1e15dcc977b8333
+refs/heads/try2: 510372129e6e7a536e3fde0e2d82c0878f1344ec
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/doc/guide.md

@@ -411,64 +411,3 @@ rest of your Rust career.
 
 Next, we'll learn more about Rust itself, by starting to write a more complicated
 program. We hope you want to do more with Rust than just print "Hello, world!"
-
-## If
-
-## Functions
-
-return
-
-comments
-
-## Testing
-
-attributes
-
-stability markers
-
-## Crates and Modules
-
-visibility
-
-## Compound Data Types
-
-Tuples
-
-Structs
-
-Enums
-
-## Match
-
-## Looping
-
-for
-
-while
-
-loop
-
-break/continue
-
-iterators
-
-## Lambdas
-
-## Generics
-
-## Traits
-
-## Operators and built-in Traits
-
-## Ownership and Lifetimes
-
-Move vs. Copy
-
-Allocation
-
-## Tasks
-
-## Macros
-
-## Unsafe
-

branches/try2/src/doc/tutorial.md

@@ -493,12 +493,11 @@ by an *action* (expression). Each case is separated by commas. It is
 often convenient to use a block expression for each case, in which case
 the commas are optional as shown below. Literals are valid patterns and
 match only their own value. A single arm may match multiple different
-patterns by combining them with the pipe operator (`|`), so long as
-every pattern binds the same set of variables (see "destructuring"
-below). Ranges of numeric literal patterns can be expressed with two
-dots, as in `M..N`. The underscore (`_`) is a wildcard pattern that
-matches any single value. (`..`) is a different wildcard that can match
-one or more fields in an `enum` variant.
+patterns by combining them with the pipe operator (`|`), so long as every
+pattern binds the same set of variables. Ranges of numeric literal
+patterns can be expressed with two dots, as in `M..N`. The underscore
+(`_`) is a wildcard pattern that matches any single value. (`..`) is a
+different wildcard that can match one or more fields in an `enum` variant.
 
 ~~~
 # let my_number = 1;

branches/try2/src/test/run-pass/issue-11677.rs

@@ -0,0 +1,24 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![allow(dead_code)]
+
+// this code used to cause an ICE
+
+trait X<T> {}
+
+struct S<T> {f: Box<X<T>>, g: Box<X<T>>}
+
+struct F;
+impl X<int> for F {}
+
+fn main() {
+  S {f: box F, g: box F};
+}