---

yaml
---
r: 134615
b: refs/heads/try
c: 5aa264a
h: refs/heads/master
i:
  134613: 97dfe7c
  134611: 23572dc
  134607: f2b0bdd
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 58413c09cd52ea4005d6ea7733ba1fb3a8f36589
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 437179ed8bf7f7672f84b19265df1ce569e70490
-refs/heads/try: 0e18c0634ebc2d47a4acf217f7ad3a8b9c9306fc
+refs/heads/try: 5aa264a14fbc386c2cbb1d8f7dc0f0d7c7f1a773
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/configure

@@ -477,6 +477,12 @@ fi
 step_msg "validating $CFG_SELF args"
 validate_opt
 
+# Temporarily support the old windows triples while the bots make the transition
+# XXX Remove me
+CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+
 # Validate the release channel
 case "$CFG_RELEASE_CHANNEL" in
     (source | nightly | beta | stable)

branches/try/mk/tests.mk

@@ -194,6 +194,9 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
 check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
+# NOTE: Remove after reprogramming windows bots
+check-fast: check-lite
+
 # Some less critical tests that are not prone to breakage.
 # Not run as part of the normal test suite, but tested by bors on checkin.
 check-secondary: check-lexer check-pretty

branches/try/src/doc/guide.md

@@ -1575,6 +1575,8 @@ we haven't seen before. Here's a simple program that reads some input,
 and then prints it back out:
 
 ```{rust,ignore}
+use std::io;
+
 fn main() {
     println!("Type something!");
 

branches/try/src/etc/zsh/_rust

@@ -4,166 +4,109 @@ local -a _rustc_opts_switches _rustc_opts_lint _rustc_opts_debug
 
 typeset -A opt_args
 
-_rustc_debuginfo_levels=(
-    "0[no debug info]"
-    "1[line-tables only (for stacktraces and breakpoints)]"
-    "2[full debug info with variable and type information (same as -g)]"
-)
-
-_rustc_crate_types=(
-    'bin'
-    'lib'
-    'rlib'
-    'dylib'
-    'staticlib'
-)
-
-_rustc_emit_types=(
-    'asm'
-    'bc'
-    'ir'
-    'obj'
-    'link'
-)
-_rustc_pretty_types=(
-    'normal[un-annotated source]'
-    'expanded[crates expanded]'
-    'typed[crates  expanded,  with  type  annotations]'
-    'identified[fully parenthesized, AST nodes and blocks with IDs]'
-    'flowgraph=[graphviz formatted flowgraph for node]:NODEID:'
-)
-_rustc_color_types=(
-    'auto[colorize, if output goes to a tty (default)]'
-    'always[always colorize output]'
-    'never[never colorize output]'
-)
-
-_rustc_opts_vals=(
-    --crate-name='[Specify the name of the crate being built]'
-    --crate-type='[Comma separated list of types of crates for the compiler to emit]:TYPES:_values -s "," "Crate types"  "$_rustc_crate_types[@]"'
-    --emit='[Comma separated list of types of output for the compiler to emit]:TYPES:_values -s "," "Emit Targets" "$_rustc_emit_types[@]"'
-    --debuginfo='[Emit DWARF debug info to the objects created]:LEVEL:_values "Debug Levels" "$_rustc_debuginfo_levels[@]"'
-    --dep-info='[Output dependency info to <filename> after compiling]::FILE:_files -/'
-    --sysroot='[Override the system root]:PATH:_files -/'
-    --cfg='[Configure the compilation environment]:SPEC:'
-    --out-dir='[Write output to compiler-chosen filename in <dir>.  Ignored  if  -o  is  specified. (default the current directory)]:DIR:_files -/'
-    -o'[Write output to <filename>. Ignored if more than one --emit is specified.]:FILENAME:_files'
-    --opt-level='[Optimize with possible levels 0-3]:LEVEL:(0 1 2 3)'
-    --pretty='[Pretty-print the input instead of compiling]::TYPE:_values "TYPES" "$_rustc_pretty_types[@]"'
-    -L'[Add a directory to the library search path]:DIR:_files -/'
-    --target='[Target triple cpu-manufacturer-kernel\[-os\] to compile]:TRIPLE:'
-    --color='[Configure coloring of output]:CONF:_values "COLORS" "$_rustc_color_types[@]"'
-    {-v,--version}'[Print version info and exit]::VERBOSE:(verbose)'
-    --explain='[Provide a detailed explanation of an error message]:OPT:'
-    --extern'[Specify where an external rust library is located]:ARG:'
-)
-
 _rustc_opts_switches=(
+    --ar'[Program to use for managing archives instead of the default.]'
+    -c'[Compile and assemble, but do not link]'
+    --cfg'[Configure the compilation environment]'
+    --crate-id'[Output the crate id and exit]'
+    --crate-file-name'[deprecated in favor of --print-file-name]'
+    --crate-name'[Specify the name of the crate being built]'
+    --crate-type'[Specify the type of crate to crate]'
+    --debuginfo'[Emit DWARF debug info to the objects created: 0 = no debug info, 1 = line-tables only (for stacktraces and breakpoints), 2 = full debug info with variable and type information (same as -g)]'
+    --dep-info'[Output dependency info to <filename> after compiling]'
     -g'[Equivalent to --debuginfo=2]'
     {-h,--help}'[Display this message]'
+    -L'[Add a directory to the library search path]'
+    --linker'[Program to use for linking instead of the default.]'
+    --link-args'[FLAGS is a space-separated list of flags passed to the linker]'
+    --llvm-args'[A list of arguments to pass to llvm, comma separated]'
+    --ls'[List the symbols defined by a library crate]'
     --no-analysis'[Parse and expand the output, but run no analysis or produce output]'
+    --no-rpath'[Disables setting the rpath in libs/exes]'
     --no-trans'[Run all passes except translation; no output]'
     -O'[Equivalent to --opt-level=2]'
+    -o'[Write output to <filename>]'
+    --opt-level'[Optimize with possible levels 0-3]'
+    --out-dir'[Write output to compiler-chosen filename in <dir>]'
     --parse-only'[Parse only; do not compile, assemble, or link]'
+    --passes'[Comma or space separated list of pass names to use]'
+    --pretty'[Pretty-print the input instead of compiling]'
     --print-crate-name'[Output the crate name and exit]'
     --print-file-name'[Output the file(s) that would be written if compilation continued and exit]'
+    --save-temps'[Write intermediate files (.bc, .opt.bc, .o) in addition to normal output]'
+    --sysroot'[Override the system root]'
     --test'[Build a test harness]'
+    --target'[Target triple cpu-manufacturer-kernel\[-os\] to compile]'
+    --target-cpu'[Select target processor (llc -mcpu=help for details)]'
+    --target-feature'[Target specific attributes (llc -mattr=help for details)]'
+    --relocation-model'[Relocation model (llc --help for details)]'
+    {-v,--version}'[Print version info and exit]'
 )
-_rustc_opts_codegen=(
-    'ar=[Path to the archive utility to use when assembling archives.]:BIN:_path_files'
-    'linker=[Path to the linker utility to use when linking libraries, executables, and objects.]:BIN:_path_files'
-    'link-args=[A space-separated list of extra arguments to pass to the linker when the linker is invoked.]:ARGS:'
-    'target-cpu=[Selects a target processor. If the value is "help", then a list of  available  CPUs is printed.]:CPU:'
-    'target-feature=[A space-separated list of features to enable or disable for the target. A preceding "+" enables a feature while a preceding "-" disables it. Available features can be discovered through target-cpu=help.]:FEATURE:'
-    'passes=[A space-separated list of extra LLVM passes to run. A value of "list" will cause rustc to print all known passes and exit. The passes specified are appended at the end of the normal pass manager.]:LIST:'
-    'llvm-args=[A space-separated list of arguments to pass through to LLVM.]:ARGS:'
-    'save-temps[If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated throughout compilation in the output directory.]'
-    'rpath[If specified, then the rpath value for dynamic libraries will be set in either dynamic library or executable outputs.]'
-    'no-prepopulate-passes[Suppresses pre-population of the LLVM pass manager that is run over the module.]'
-    'no-vectorize-loops[Suppresses running the loop vectorization LLVM pass, regardless of optimization level.]'
-    'no-vectorize-slp[Suppresses running the LLVM SLP vectorization pass, regardless of optimization level.]'
-    'soft-float[Generates software floating point library calls instead of hardware instructions.]'
-    'prefer-dynamic[Prefers dynamic linking to static linking.]'
-    "no-integrated-as[Force usage of an external assembler rather than LLVM's integrated one.]"
-    'no-redzone[disable the use of the redzone]'
-    'relocation-model=[The relocation model to use. (default: pic)]:MODEL:(pic static dynamic-no-pic)'
-    'code-model=[choose the code model to use (llc -code-model for details)]:MODEL:'
-    'metadata=[metadata to mangle symbol names with]:VAL:'
-    'extra-filenames=[extra data to put in each output filename]:VAL:'
-    'codegen-units=[divide crate into N units to optimize in parallel]:N:'
-    'help[Show all codegen options]'
-)
-
 _rustc_opts_lint=(
-    'help[Show a list of all lints]'
-    'experimental[detects use of #\[experimental\] items]'
-    'heap-memory[use of any (Box type or @ type) heap memory]'
-    'managed-heap-memory[use of managed (@ type) heap memory]'
-    'missing-doc[detects missing documentation for public members]'
-    'non-uppercase-statics[static constants should have uppercase identifiers]'
-    'owned-heap-memory[use of owned (~ type) heap memory]'
-    'unnecessary-qualification[detects unnecessarily qualified names]'
-    'unsafe-block[usage of an `unsafe` block]'
-    'unstable[detects use of #\[unstable\] items (incl. items with no stability attribute)]'
-    'unused-result[unused result of an expression in a statement]'
-    'variant-size-difference[detects enums with widely varying variant sizes]'
+    'attribute-usage[detects bad use of attributes]'
     'ctypes[proper use of libc types in foreign modules]'
     'dead-assignment[detect assignments that will never be read]'
     'dead-code[detect piece of code that will never be used]'
+    'default-type-param-usage[prevents explicitly setting a type parameter with a default]'
     'deprecated[detects use of #\[deprecated\] items]'
+    'experimental[detects use of #\[experimental\] items]'
+    'heap-memory[use of any (~ type or @ type) heap memory]'
+    'managed-heap-memory[use of managed (@ type) heap memory]'
+    'missing-doc[detects missing documentation for public members]'
     'non-camel-case-types[types, variants and traits should have camel case names]'
-    'non-snake-case[methods, functions, lifetime parameters and modules should have snake case names]'
+    'non-uppercase-pattern-statics[static constants in match patterns should be all caps]'
+    'non-uppercase-statics[static constants should have uppercase identifiers]'
+    'owned-heap-memory[use of owned (~ type) heap memory]'
     'path-statement[path statements with no effect]'
-    'raw-pointer-deriving[uses of #\[deriving\] with raw pointers are rarely correct]'
     'type-limits[comparisons made useless by limits of the types involved]'
     'type-overflow[literal out of range for its type]'
+    'unknown-crate-type[unknown crate type found in #\[crate_type\] directive]'
+    'unknown-features[unknown features found in crate-level #\[feature\] directives]'
     'unnecessary-allocation[detects unnecessary allocations that can be eliminated]'
     'unnecessary-parens[`if`, `match`, `while` and `return` do not need parentheses]'
+    'unnecessary-qualification[detects unnecessarily qualified names]'
+    'unnecessary-typecast[detects unnecessary type casts, that can be removed]'
     'unreachable-code[detects unreachable code]'
     'unrecognized-lint[unrecognized lint attribute]'
-    'unsigned-negate[using an unary minus operator on unsigned type]'
-    'unused-attribute[detects attributes that were not used by the compiler]'
+    'unsafe-block[usage of an `unsafe` block]'
+    'unstable[detects use of #\[unstable\] items (incl. items with no stability attribute)]'
     'unused-imports[imports that are never used]'
     'unused-must-use[unused result of a type flagged as #\[must_use\]]'
     "unused-mut[detect mut variables which don't need to be mutable]"
+    'unused-result[unused result of an expression in a statement]'
     'unused-unsafe[unnecessary use of an `unsafe` block]'
     'unused-variable[detect variables which are not used in any way]'
-    'visible-private-types[detect use of private types in exported type signatures]'
     'warnings[mass-change the level for lints which produce warnings]'
     'while-true[suggest using `loop { }` instead of `while true { }`]'
-    'unknown-crate-type[unknown crate type found in #\[crate_type\] directive]'
-    'unknown-features[unknown features found in crate-level #\[feature\] directives]'
-    'bad-style[group of non_camel_case_types, non_snake_case, non_uppercase_statics]'
-    'unused[group of unused_imports, unused_variable, dead_assignment, dead_code, unused_mut, unreachable_code]'
 )
 
 _rustc_opts_debug=(
-    'verbose[in general, enable more debug printouts]'
-    'time-passes[measure time of each rustc pass]'
-    'count-llvm-insns[count where LLVM instrs originate]'
-    'time-llvm-passes[measure time of each LLVM pass]'
-    'trans-stats[gather trans statistics]'
     'asm-comments[generate comments into the assembly (may change behavior)]'
-    'no-verify[skip LLVM verification]'
     'borrowck-stats[gather borrowck statistics]'
-    'no-landing-pads[omit landing pads for unwinding]'
-    'debug-llvm[enable debug output from LLVM]'
-    'show-span[show spans for compiler debugging]'
+    'count-llvm-insns[count where LLVM instrs originate]'
     'count-type-sizes[count the sizes of aggregate types]'
+    'debug-info[Produce debug info (experimental)]'
+    'debug-llvm[enable debug output from LLVM]'
+    'extra-debug-info[Extra debugging info (experimental)]'
+    'gc[Garbage collect shared data (experimental)]'
+    'gen-crate-map[Force generation of a toplevel crate map]'
+    'lto[Perform LLVM link-time optimizations]'
     'meta-stats[gather metadata statistics]'
+    "no-integrated-as[Use external assembler rather than LLVM's integrated one]"
+    'no-landing-pads[omit landing pads for unwinding]'
     'no-opt[do not optimize, even if -O is passed]'
+    "no-prepopulate-passes[Don't pre-populate the pass managers with a list of passes, only use the passes from --passes]"
+    "no-vectorize-loops[Don't run the loop vectorization optimization passes]"
+    "no-vectorize-slp[Don't run LLVM's SLP vectorization passes]"
+    'no-verify[skip LLVM verification]'
+    'prefer-dynamic[Prefer dynamic linking to static linking]'
     'print-link-args[Print the arguments passed to the linker]'
-    'gc[Garbage collect shared data (experimental)]'
     'print-llvm-passes[Prints the llvm optimization passes being run]'
-    'lto[Perform LLVM link-time optimizations]'
-    'ast-json[Print the AST as JSON and halt]'
-    'ast-json-noexpand[Print the pre-expansion AST as JSON and halt]'
-    'ls[List the symbols defined by a library crate]'
-    'save-analysis[Write syntax and type analysis information in addition to normal output]'
-    'flowgraph-print-loans[Include loan analysis data in --pretty flowgraph output]'
-    'flowgraph-print-moves[Include move analysis data in --pretty flowgraph output]'
-    'flowgraph-print-assigns[Include assignment analysis data in --pretty flowgraph output]'
-    'flowgraph-print-all[Include all dataflow analysis data in --pretty flowgraph output]'
+    'soft-float[Generate software floating point library calls]'
+    'time-llvm-passes[measure time of each LLVM pass]'
+    'time-passes[measure time of each rustc pass]'
+    'trans-stats[gather trans statistics]'
+    'verbose[in general, enable more debug printouts]'
 )
 
 _rustc_opts_fun_lint(){
@@ -172,20 +115,14 @@ _rustc_opts_fun_lint(){
 }
 
 _rustc_opts_fun_debug(){
-    _values 'options' "$_rustc_opts_debug[@]"
-}
-
-_rustc_opts_fun_codegen(){
-    _values 'options' "$_rustc_opts_codegen[@]"
+    _describe 'options' _rustc_opts_debug
 }
 
 _arguments -s :  \
-    '(-W --warn)'{-W,--warn=}'[Set lint warnings]:lint options:_rustc_opts_fun_lint' \
-    '(-A --allow)'{-A,--allow=}'[Set lint allowed]:lint options:_rustc_opts_fun_lint' \
-    '(-D --deny)'{-D,--deny=}'[Set lint denied]:lint options:_rustc_opts_fun_lint' \
-    '(-F --forbid)'{-F,--forbid=}'[Set lint forbidden]:lint options:_rustc_opts_fun_lint' \
+    '(-W --warn)'{-W,--warn}'[Set lint warnings]:lint options:_rustc_opts_fun_lint' \
+    '(-A --allow)'{-A,--allow}'[Set lint allowed]:lint options:_rustc_opts_fun_lint' \
+    '(-D --deny)'{-D,--deny}'[Set lint denied]:lint options:_rustc_opts_fun_lint' \
+    '(-F --forbid)'{-F,--forbid}'[Set lint forbidden]:lint options:_rustc_opts_fun_lint' \
     '*-Z[Set internal debugging options]:debug options:_rustc_opts_fun_debug' \
-    '*-C[Set internal Codegen options]:codegen options:_rustc_opts_fun_codegen' \
     "$_rustc_opts_switches[@]" \
-    "$_rustc_opts_vals[@]" \
-    '::files:_files -g "*.rs"'
+    '*::files:_files -g "*.rs"'

branches/try/src/grammar/verify.rs

@@ -211,7 +211,7 @@ fn parse_antlr_token(s: &str, tokens: &HashMap<String, Token>) -> TokenAndSpan {
     let sp = syntax::codemap::Span {
         lo: syntax::codemap::BytePos(from_str::<u32>(start).unwrap() - offset),
         hi: syntax::codemap::BytePos(from_str::<u32>(end).unwrap() + 1),
-        expn_id: syntax::codemap::NO_EXPANSION
+        expn_info: None
     };
 
     TokenAndSpan {

branches/try/src/libcollections/string.rs

@@ -872,7 +872,7 @@ mod tests {
 
     use {Mutable, MutableSeq};
     use str;
-    use str::{Str, StrSlice, Owned};
+    use str::{Str, StrSlice, Owned, Slice};
     use super::String;
     use vec::Vec;
 
@@ -898,10 +898,10 @@ mod tests {
     #[test]
     fn test_from_utf8_lossy() {
         let xs = b"hello";
-        assert_eq!(String::from_utf8_lossy(xs), str::Slice("hello"));
+        assert_eq!(String::from_utf8_lossy(xs), Slice("hello"));
 
         let xs = "ศไทย中华Việt Nam".as_bytes();
-        assert_eq!(String::from_utf8_lossy(xs), str::Slice("ศไทย中华Việt Nam"));
+        assert_eq!(String::from_utf8_lossy(xs), Slice("ศไทย中华Việt Nam"));
 
         let xs = b"Hello\xC2 There\xFF Goodbye";
         assert_eq!(String::from_utf8_lossy(xs),