---

yaml
---
r: 194030
b: refs/heads/beta
c: 8f0de74
h: refs/heads/master
v: v3

Author: steveklabnik

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 420bf9dd44499e2480483fd7eb08998899cb6b8c
+refs/heads/beta: 8f0de740f8a5a21a9c07552ae89654412382b9f3
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/man/rustc.1

@@ -242,7 +242,7 @@ full debug info with variable and type information.
 \fBopt\-level\fR=\fIVAL\fR
 Optimize with possible levels 0\[en]3
 
-.SH ENVIRONMENT VARIABLES
+.SH ENVIRONMENT
 
 Some of these affect the output of the compiler, while others affect programs
 which link to the standard library.

branches/beta/src/compiletest/header.rs

@@ -163,9 +163,6 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
     fn ignore_target(config: &Config) -> String {
         format!("ignore-{}", util::get_os(&config.target))
     }
-    fn ignore_architecture(config: &Config) -> String {
-        format!("ignore-{}", util::get_arch(&config.target))
-    }
     fn ignore_stage(config: &Config) -> String {
         format!("ignore-{}",
                 config.stage_id.split('-').next().unwrap())
@@ -229,7 +226,6 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
     let val = iter_header(testfile, &mut |ln| {
         !parse_name_directive(ln, "ignore-test") &&
         !parse_name_directive(ln, &ignore_target(config)) &&
-        !parse_name_directive(ln, &ignore_architecture(config)) &&
         !parse_name_directive(ln, &ignore_stage(config)) &&
         !(config.mode == common::Pretty && parse_name_directive(ln, "ignore-pretty")) &&
         !(config.target != config.host && parse_name_directive(ln, "ignore-cross-compile")) &&

branches/beta/src/compiletest/procsrv.rs

@@ -10,10 +10,9 @@
 
 #![allow(deprecated)] // for old path, for dynamic_lib
 
-use std::dynamic_lib::DynamicLibrary;
-use std::io::prelude::*;
-use std::old_path::Path;
 use std::process::{ExitStatus, Command, Child, Output, Stdio};
+use std::io::prelude::*;
+use std::dynamic_lib::DynamicLibrary;
 
 fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
     // Need to be sure to put both the lib_path and the aux path in the dylib

branches/beta/src/compiletest/util.rs

@@ -25,23 +25,6 @@ const OS_TABLE: &'static [(&'static str, &'static str)] = &[
     ("openbsd", "openbsd"),
 ];
 
-const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
-    ("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"),
-    ("hexagon", "hexagon"),
-    ("s390x", "systemz"),
-];
-
 pub fn get_os(triple: &str) -> &'static str {
     for &(triple_os, os) in OS_TABLE {
         if triple.contains(triple_os) {
@@ -50,14 +33,6 @@ pub fn get_os(triple: &str) -> &'static str {
     }
     panic!("Cannot determine OS from triple");
 }
-pub fn get_arch(triple: &str) -> &'static str {
-    for &(triple_arch, arch) in ARCH_TABLE {
-        if triple.contains(triple_arch) {
-            return arch
-        }
-    }
-    panic!("Cannot determine Architecture from triple");
-}
 
 pub fn make_new_path(path: &str) -> String {
     assert!(cfg!(windows));

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

@@ -14,6 +14,7 @@
     * [Strings](strings.md)
     * [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md)
     * [Standard Input](standard-input.md)
+    * [Guessing Game](guessing-game.md)
 * [II: Intermediate Rust](intermediate.md)
     * [Crates and Modules](crates-and-modules.md)
     * [Testing](testing.md)

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

@@ -6,11 +6,9 @@ off.
 # Syntactic requirements
 
 Even when Rust code contains un-expanded macros, it can be parsed as a full
-[syntax tree][ast]. This property can be very useful for editors and other
-tools that process code. It also has a few consequences for the design of
-Rust's macro system.
-
-[ast]: glossary.html#abstract-syntax-tree
+syntax tree. This property can be very useful for editors and other tools that
+process code. It also has a few consequences for the design of Rust's macro
+system.
 
 One consequence is that Rust must determine, when it parses a macro invocation,
 whether the macro stands in for

branches/beta/src/doc/trpl/glossary.md

@@ -14,26 +14,3 @@ let z = (8, 2, 6);
 ```
 
 In the example above `x` and `y` have arity 2. `z` has arity 3.
-
-### Abstract Syntax Tree
-
-When a compiler is compiling your program, it does a number of different
-things. One of the things that it does is turn the text of your program into an
-'abstract syntax tree,' or 'AST.' This tree is a representation of the
-structure of your program. For example, `2 + 3` can be turned into a tree:
-
-```text
-  +
- / \
-2   3
-```
-
-And `2 + (3 * 4)` would look like this:
-
-```text
-  +
- / \
-2   *
-   / \
-  3   4
-```