---

yaml
---
r: 100817
b: refs/heads/snap-stage3
c: 90311fc
h: refs/heads/master
i:
  100815: c320899
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e3b1f3c443c048913e2d573fcc5a9c2be3484a78
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9b173edf863c3f04a0d8534bdd3e3cbef31c711a
+refs/heads/snap-stage3: 90311fc68fb484310df9ffc614e592dee30644ae
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/crates.mk

@@ -60,9 +60,9 @@ DEPS_extra := std term sync serialize getopts collections
 DEPS_green := std native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
-DEPS_syntax := std term serialize collections
+DEPS_syntax := std extra term serialize collections
 DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
-              collections extra
+              collections
 DEPS_rustdoc := rustc native:sundown serialize sync getopts collections
 DEPS_flate := std native:miniz
 DEPS_arena := std collections

branches/snap-stage3/mk/rt.mk

@@ -236,7 +236,7 @@ COMPRT_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),compiler-rt)
 COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
 COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
 
-$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
+$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS)
 	@$$(call E, make: compiler-rt)
 	$$(Q)$$(MAKE) -C "$(S)src/compiler-rt" \
 		ProjSrcRoot="$(S)src/compiler-rt" \

branches/snap-stage3/src/compiletest/header.rs

@@ -30,8 +30,6 @@ pub struct TestProps {
     check_lines: ~[~str],
     // Flag to force a crate to be built with the host architecture
     force_host: bool,
-    // Check stdout for error-pattern output as well as stderr
-    check_stdout: bool,
 }
 
 // Load any test directives embedded in the file
@@ -44,7 +42,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
     let mut debugger_cmds = ~[];
     let mut check_lines = ~[];
     let mut force_host = false;
-    let mut check_stdout = false;
     iter_header(testfile, |ln| {
         match parse_error_pattern(ln) {
           Some(ep) => error_patterns.push(ep),
@@ -63,10 +60,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
             force_host = parse_force_host(ln);
         }
 
-        if !check_stdout {
-            check_stdout = parse_check_stdout(ln);
-        }
-
         match parse_aux_build(ln) {
             Some(ab) => { aux_builds.push(ab); }
             None => {}
@@ -98,7 +91,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
         debugger_cmds: debugger_cmds,
         check_lines: check_lines,
         force_host: force_host,
-        check_stdout: check_stdout,
     };
 }
 
@@ -163,10 +155,6 @@ fn parse_force_host(line: &str) -> bool {
     parse_name_directive(line, "force-host")
 }
 
-fn parse_check_stdout(line: &str) -> bool {
-    parse_name_directive(line, "check-stdout")
-}
-
 fn parse_exec_env(line: &str) -> Option<(~str, ~str)> {
     parse_name_value_directive(line, ~"exec-env").map(|nv| {
         // nv is either FOO or FOO=BAR

branches/snap-stage3/src/compiletest/runtest.rs

@@ -452,12 +452,7 @@ fn check_error_patterns(props: &TestProps,
     let mut next_err_idx = 0u;
     let mut next_err_pat = &props.error_patterns[next_err_idx];
     let mut done = false;
-    let output_to_check = if props.check_stdout {
-        ProcRes.stdout + ProcRes.stderr
-    } else {
-        ProcRes.stderr.clone()
-    };
-    for line in output_to_check.lines() {
+    for line in ProcRes.stderr.lines() {
         if line.contains(*next_err_pat) {
             debug!("found error pattern {}", *next_err_pat);
             next_err_idx += 1u;

branches/snap-stage3/src/doc/tutorial.md

@@ -57,8 +57,8 @@ they don't contain references to names that aren't actually defined.
 
 # Getting started
 
-> **WARNING**: The tarball and installer links are for the most recent
-> release, not master. To use master, you **must** build from [git].
+> **NOTE**: The tarball and installer links are for the most recent release,
+> not master.
 
 The Rust compiler currently must be built from a [tarball] or [git], unless
 you are on Windows, in which case using the [installer][win-exe] is

branches/snap-stage3/src/etc/emacs/rust-mode.el

@@ -130,7 +130,6 @@
   '("as"
     "break"
     "continue"
-    "crate"
     "do"
     "else" "enum" "extern"
     "false" "fn" "for"

branches/snap-stage3/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

@@ -40,7 +40,6 @@
 		<keyword>break</keyword>
 		<keyword>const</keyword>
 		<keyword>continue</keyword>
-		<keyword>crate</keyword>
 		<keyword>do</keyword>
 		<keyword>drop</keyword>
 		<keyword>else</keyword>

branches/snap-stage3/src/etc/kate/rust.xml

@@ -19,7 +19,6 @@
 		<item> as </item>
 		<item> break </item>
 		<item> continue </item>
-		<item> crate </item>
 		<item> do </item>
 		<item> drop </item>
 		<item> else </item>

branches/snap-stage3/src/etc/vim/syntax/rust.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Patrick Walton <[email protected]>
 " Maintainer:   Ben Blum <[email protected]>
 " Maintainer:   Chris Morgan <[email protected]>
-" Last Change:  2014 Feb 14
+" Last Change:  2014 Jan 4
 
 if version < 600
   syntax clear
@@ -18,8 +18,7 @@ syn keyword   rustOperator    as
 
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustFail        "\<fail\(\w\)*!" contained
-syn keyword   rustKeyword     break continue do
-syn keyword   rustKeyword     extern nextgroup=rustExternCrate skipwhite
+syn keyword   rustKeyword     break continue do extern
 syn keyword   rustKeyword     for in if impl let
 syn keyword   rustKeyword     loop once priv pub
 syn keyword   rustKeyword     return
@@ -32,10 +31,6 @@ syn keyword   rustKeyword     proc
 syn keyword   rustStorage     mut ref static
 syn keyword   rustObsoleteStorage const
 
-syn keyword   rustInvalidBareKeyword crate
-
-syn keyword   rustExternCrate crate contained nextgroup=rustIdentifier skipwhite
-
 syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
@@ -86,7 +81,7 @@ syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
 
 syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
 syn keyword rustTrait Bitwise Bounded Integer Fractional Real RealExt
-syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul CheckedDiv
+syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
 syn keyword rustTrait Orderable Signed Unsigned Round
 syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive
 syn keyword rustTrait GenericPath Path PosixPath WindowsPath
@@ -250,8 +245,6 @@ hi def link rustDeriving      PreProc
 hi def link rustStorage       StorageClass
 hi def link rustObsoleteStorage Error
 hi def link rustLifetime      Special
-hi def link rustInvalidBareKeyword Error
-hi def link rustExternCrate   rustKeyword
 
 " Other Suggestions:
 " hi rustAttribute ctermfg=cyan

branches/snap-stage3/src/libcollections/bitv.rs

@@ -1561,7 +1561,6 @@ mod tests {
         let mut bitv = 0 as uint;
         b.iter(|| {
             bitv |= (1 << ((r.next_u32() as uint) % uint::BITS));
-            &bitv
         })
     }
 
@@ -1571,7 +1570,6 @@ mod tests {
         let mut bitv = SmallBitv::new(uint::BITS);
         b.iter(|| {
             bitv.set((r.next_u32() as uint) % uint::BITS, true);
-            &bitv
         })
     }
 
@@ -1581,7 +1579,6 @@ mod tests {
         let mut bitv = BigBitv::new(~[0]);
         b.iter(|| {
             bitv.set((r.next_u32() as uint) % uint::BITS, true);
-            &bitv
         })
     }
 
@@ -1593,7 +1590,6 @@ mod tests {
         let mut bitv = BigBitv::new(storage);
         b.iter(|| {
             bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
-            &bitv
         })
     }
 
@@ -1603,7 +1599,6 @@ mod tests {
         let mut bitv = Bitv::new(BENCH_BITS, false);
         b.iter(|| {
             bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
-            &bitv
         })
     }
 
@@ -1613,7 +1608,6 @@ mod tests {
         let mut bitv = Bitv::new(uint::BITS, false);
         b.iter(|| {
             bitv.set((r.next_u32() as uint) % uint::BITS, true);
-            &bitv
         })
     }
 
@@ -1623,7 +1617,6 @@ mod tests {
         let mut bitv = BitvSet::new();
         b.iter(|| {
             bitv.insert((r.next_u32() as uint) % uint::BITS);
-            &bitv
         })
     }
 
@@ -1633,7 +1626,6 @@ mod tests {
         let mut bitv = BitvSet::new();
         b.iter(|| {
             bitv.insert((r.next_u32() as uint) % BENCH_BITS);
-            &bitv
         })
     }
 

branches/snap-stage3/src/libcollections/deque.rs

@@ -115,9 +115,8 @@ pub mod bench {
         // measure
         let mut i = 0;
         bh.iter(|| {
-            let x = map.find(&i);
+            map.find(&i);
             i = (i + 1) % n;
-            x
         })
      }
 }