---

yaml
---
r: 121844
b: refs/heads/master
c: abdf71c
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 64019e764f1837a4a19297fc9f7a99595e37cf51
+refs/heads/master: abdf71cf73fd8b0b5bca78da830fe6f2a49ff8c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: afdfe40aa0b7dfc7800dddbc1f55da979abfe486
 refs/heads/try: 18dc3bc9e3314a250c0718ab329938e676410cdf

trunk/src/doc/guide.md

@@ -411,3 +411,64 @@ 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
+

trunk/src/doc/tutorial.md

@@ -493,11 +493,12 @@ 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. 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 (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.
 
 ~~~
 # let my_number = 1;

trunk/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};
+}