---

yaml
---
r: 195191
b: refs/heads/tmp
c: ce668a8
h: refs/heads/master
i:
  195189: 636fec5
  195187: 3a7b04e
  195183: 6bccf7e
v: v3

Author: tshepang

[refs]

@@ -34,7 +34,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: d8be84eb4499e21bd98a3500c8760540996df23b
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: fbbf02db1cf457b0d9bde88510297bc4a39f6501
+refs/heads/tmp: ce668a873ef8a27e3536f6c981aee364edfe5116
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 53a183f0274316596bf9405944d4f0468d8c93e4
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/compiletest/util.rs

@@ -13,34 +13,33 @@ use common::Config;
 
 /// Conversion table from triple OS name to Rust SYSNAME
 const OS_TABLE: &'static [(&'static str, &'static str)] = &[
-    ("android", "android"),
-    ("bitrig", "bitrig"),
-    ("darwin", "macos"),
-    ("dragonfly", "dragonfly"),
-    ("freebsd", "freebsd"),
-    ("ios", "ios"),
-    ("linux", "linux"),
     ("mingw32", "windows"),
-    ("openbsd", "openbsd"),
     ("win32", "windows"),
     ("windows", "windows"),
+    ("darwin", "macos"),
+    ("android", "android"),
+    ("linux", "linux"),
+    ("freebsd", "freebsd"),
+    ("dragonfly", "dragonfly"),
+    ("bitrig", "bitrig"),
+    ("openbsd", "openbsd"),
 ];
 
 const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
-    ("aarch64", "aarch64"),
-    ("amd64", "x86_64"),
-    ("arm", "arm"),
-    ("arm64", "aarch64"),
-    ("hexagon", "hexagon"),
     ("i386", "x86"),
     ("i686", "x86"),
+    ("amd64", "x86_64"),
+    ("x86_64", "x86_64"),
+    ("sparc", "sparc"),
+    ("powerpc", "powerpc"),
+    ("arm64", "aarch64"),
+    ("arm", "arm"),
+    ("aarch64", "aarch64"),
     ("mips", "mips"),
+    ("xcore", "xcore"),
     ("msp430", "msp430"),
-    ("powerpc", "powerpc"),
+    ("hexagon", "hexagon"),
     ("s390x", "systemz"),
-    ("sparc", "sparc"),
-    ("x86_64", "x86_64"),
-    ("xcore", "xcore"),
 ];
 
 pub fn get_os(triple: &str) -> &'static str {

branches/tmp/src/doc/trpl/README.md

@@ -11,7 +11,8 @@ navigate through the menu on the left.
 <h2 class="section-header"><a href="basic.html">Basics</a></h2>
 
 This section is a linear introduction to the basic syntax and semantics of
-Rust. It has individual sections on each part of Rust's syntax.
+Rust. It has individual sections on each part of Rust's syntax, and culminates
+in a small project: a guessing game.
 
 After reading "Basics," you will have a good foundation to learn more about
 Rust, and can write very simple programs.
@@ -28,12 +29,7 @@ and will be able to understand most Rust code and write more complex programs.
 
 In a similar fashion to "Intermediate," this section is full of individual,
 deep-dive chapters, which stand alone and can be read in any order. These
-chapters focus on the most complex features,
+chapters focus on the most complex features, as well as some things that
+are only available in upcoming versions of Rust.
 
-<h2 class="section-header"><a href="unstable.html">Unstable</a></h2>
-
-In a similar fashion to "Intermediate," this section is full of individual,
-deep-dive chapters, which stand alone and can be read in any order.
-
-This chapter contains things that are only available on the nightly channel of
-Rust.
+After reading "Advanced," you'll be a Rust expert!

branches/tmp/src/doc/trpl/SUMMARY.md

@@ -36,12 +36,6 @@
     * [FFI](ffi.md)
     * [Unsafe Code](unsafe.md)
     * [Advanced Macros](advanced-macros.md)
-* [Unstable Rust](unstable.md)
     * [Compiler Plugins](plugins.md)
-    * [Inline Assembly](inline-assembly.md)
-    * [No stdlib](no-stdlib.md)
-    * [Intrinsics](intrinsics.md)
-    * [Lang items](lang-items.md)
-    * [Link args](link-args.md)
 * [Conclusion](conclusion.md)
 * [Glossary](glossary.md)

branches/tmp/src/doc/trpl/advanced-macros.md

@@ -206,6 +206,8 @@ the [Bitwise Cyclic Tag](http://esolangs.org/wiki/Bitwise_Cyclic_Tag) automaton
 within Rust's macro system.
 
 ```rust
+#![feature(trace_macros)]
+
 macro_rules! bct {
     // cmd 0:  d ... => ...
     (0, $($ps:tt),* ; $_d:tt)
@@ -227,6 +229,13 @@ macro_rules! bct {
     ( $($ps:tt),* ; )
         => (());
 }
+
+fn main() {
+    trace_macros!(true);
+# /* just check the definition
+    bct!(0, 0, 1, 1, 1 ; 1, 0, 1);
+# */
+}
 ```
 
 Exercise: use macros to reduce duplication in the above definition of the

branches/tmp/src/doc/trpl/arrays-vectors-and-slices.md

@@ -99,5 +99,7 @@ You can also take a slice of a vector, `String`, or `&str`, because they are
 backed by arrays. Slices have type `&[T]`, which we'll talk about when we cover
 generics.
 
-We have now learned all of the most basic Rust concepts. Next, we learn how to
-get input from the keyboard.
+We have now learned all of the most basic Rust concepts. We're ready to start
+building ourselves a guessing game, we just need to know one last thing: how to
+get input from the keyboard. You can't have a guessing game without the ability
+to guess!

branches/tmp/src/doc/trpl/basic.md

@@ -1,7 +1,8 @@
 % Basics
 
 This section is a linear introduction to the basic syntax and semantics of
-Rust. It has individual sections on each part of Rust's syntax.
+Rust. It has individual sections on each part of Rust's syntax, and cumulates
+in a small project: a guessing game.
 
 After reading "Basics," you will have a good foundation to learn more about
 Rust, and can write very simple programs.

branches/tmp/src/doc/trpl/compound-data-types.md

@@ -361,4 +361,5 @@ and brittle `if`/`else`s.
 
 [arity]: ./glossary.html#arity
 [match]: ./match.html
+[game]: ./guessing-game.html#comparing-guesses
 [generics]: ./generics.html

branches/tmp/src/doc/trpl/documentation.md

@@ -352,7 +352,7 @@ Here’s an example of documenting a macro:
 /// # }
 /// ```
 ///
-/// ```should_panic
+/// ```should_fail
 /// # #[macro_use] extern crate foo;
 /// # fn main() {
 /// panic_unless!(true == false, “I’m broken.”);

branches/tmp/src/doc/trpl/ffi.md

@@ -366,6 +366,31 @@ A few examples of how this model can be used are:
 
 On OSX, frameworks behave with the same semantics as a dynamic library.
 
+## The `link_args` attribute
+
+There is one other way to tell rustc how to customize linking, and that is via
+the `link_args` attribute. This attribute is applied to `extern` blocks and
+specifies raw flags which need to get passed to the linker when producing an
+artifact. An example usage would be:
+
+``` no_run
+#![feature(link_args)]
+
+#[link_args = "-foo -bar -baz"]
+extern {}
+# fn main() {}
+```
+
+Note that this feature is currently hidden behind the `feature(link_args)` gate
+because this is not a sanctioned way of performing linking. Right now rustc
+shells out to the system linker, so it makes sense to provide extra command line
+arguments, but this will not always be the case. In the future rustc may use
+LLVM directly to link native libraries in which case `link_args` will have no
+meaning.
+
+It is highly recommended to *not* use this attribute, and rather use the more
+formal `#[link(...)]` attribute on `extern` blocks instead.
+
 # Unsafe blocks
 
 Some operations, like dereferencing unsafe pointers or calling functions that have been marked