---

yaml
---
r: 161211
b: refs/heads/snap-stage3
c: 5a08e67
h: refs/heads/master
i:
  161209: 0705bd1
  161207: 68b7f55
v: v3

Author: Gekkio

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ab8d811ebdbf5dbd59f6a3d94f99f035491cedf5
+refs/heads/snap-stage3: 5a08e679c792cbb5110c18d80a5090ad31bb103a
 refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/AUTHORS.txt

@@ -121,7 +121,6 @@ Cole Mickens <[email protected]>
 Colin Davidson <[email protected]>
 Colin Sherratt <[email protected]>
 Conrad Kleinespel <[email protected]>
-Corey Farwell <[email protected]>
 Corey Ford <[email protected]>
 Corey Richardson <[email protected]>
 DJUrsus <[email protected]>

branches/snap-stage3/configure

@@ -711,6 +711,11 @@ then
     fi
     step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
     putvar CFG_LOCAL_RUST_ROOT
+else
+    if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
+    then
+       warn "Use of --local-rust-root without --enable-local-rust"
+    fi
 fi
 
 # Force freebsd to build with clang; gcc doesn't like us there
@@ -888,10 +893,7 @@ CFG_PREFIX=${CFG_PREFIX%/}
 CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-CFG_SUPPORTED_TARGET=""
-for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
-  CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
-done
+CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""

branches/snap-stage3/mk/cfg/arm-apple-ios.mk renamed to branches/snap-stage3/mk/cfg/arm-apple-ios

@@ -190,14 +190,11 @@ endif
 # Target-and-rule "utility variables"
 ######################################################################
 
-define DEF_FOR_TARGET
+define DEF_X
 X_$(1) := $(CFG_EXE_SUFFIX_$(1))
-ifndef CFG_LLVM_TARGET_$(1)
-CFG_LLVM_TARGET_$(1) := $(1)
-endif
 endef
 $(foreach target,$(CFG_TARGET), \
-  $(eval $(call DEF_FOR_TARGET,$(target))))
+  $(eval $(call DEF_X,$(target))))
 
 # "Source" files we generate in builddir along the way.
 GENERATED :=

branches/snap-stage3/mk/cfg/arm-linux-androideabi.mk renamed to branches/snap-stage3/mk/cfg/arm-linux-androideabi

@@ -113,7 +113,7 @@ $(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
 
 CFG_RLIB_GLOB=lib$(1)-*.rlib
 
-include $(wildcard $(CFG_SRC_DIR)mk/cfg/*.mk)
+include $(wildcard $(CFG_SRC_DIR)mk/cfg/*)
 
 # The -Qunused-arguments sidesteps spurious warnings from clang
 define FILTER_FLAGS

branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabi.mk renamed to branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabi

@@ -75,7 +75,7 @@ $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.ll $$(MKFILE_DEPS) \
 	@mkdir -p $$(@D)
 	@$$(call E, compile: $$@)
 	$$(Q)$$(LLC_$$(CFG_BUILD)) $$(CFG_LLC_FLAGS_$(1)) \
-	    -filetype=obj -mtriple=$$(CFG_LLVM_TARGET_$(1)) -relocation-model=pic -o $$@ $$<
+	    -filetype=obj -mtriple=$(1) -relocation-model=pic -o $$@ $$<
 
 $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.c $$(MKFILE_DEPS)
 	@mkdir -p $$(@D)

branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabihf.mk renamed to branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabihf

@@ -22,7 +22,7 @@ ifdef CFG_ENABLE_LOCAL_RUST
 else
 	$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD) $(SNAPSHOT_FILE)
 endif
-	$(Q)if [ -e "$@" ]; then touch "$@"; else echo "ERROR: snapshot $@ not found"; exit 1; fi
+	$(Q)touch $@
 
 # For other targets, let the host build the target:
 

branches/snap-stage3/mk/cfg/i386-apple-ios.mk renamed to branches/snap-stage3/mk/cfg/i386-apple-ios

@@ -116,7 +116,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
 		$$(foreach dep,$$(TOOL_DEPS_$(4)), \
 		    $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
 		$$(TSREQ$(1)_T_$(2)_H_$(3)) \
-		| $$(TBIN$(1)_T_$(2)_H_$(3))/
+		| $$(TBIN$(1)_T_$(4)_H_$(3))/
 	@$$(call E, rustc: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
 

branches/snap-stage3/mk/cfg/i686-apple-darwin.mk renamed to branches/snap-stage3/mk/cfg/i686-apple-darwin

@@ -1161,7 +1161,7 @@ fn compile_test_(config: &Config, props: &TestProps,
     let args = make_compile_args(config,
                                  props,
                                  link_args,
-                                 |a, b| TargetLocation::ThisFile(make_exe_name(a, b)), testfile);
+                                 |a, b| ThisFile(make_exe_name(a, b)), testfile);
     compose_and_run_compiler(config, props, testfile, args, None)
 }
 
@@ -1219,7 +1219,7 @@ fn compose_and_run_compiler(
                               crate_type,
                               |a,b| {
                                   let f = make_lib_name(a, b, testfile);
-                                  TargetLocation::ThisDirectory(f.dir_path())
+                                  ThisDirectory(f.dir_path())
                               },
                               &abs_ab);
         let auxres = compose_and_run(config,
@@ -1296,11 +1296,11 @@ fn make_compile_args(config: &Config,
         args.push("prefer-dynamic".to_string());
     }
     let path = match xform_file {
-        TargetLocation::ThisFile(path) => {
+        ThisFile(path) => {
             args.push("-o".to_string());
             path
         }
-        TargetLocation::ThisDirectory(path) => {
+        ThisDirectory(path) => {
             args.push("--out-dir".to_string());
             path
         }
@@ -1566,7 +1566,7 @@ fn _arm_exec_compiled_test(config: &Config,
 
     let mut exitcode: int = 0;
     for c in exitcode_out.as_slice().chars() {
-        if !c.is_numeric() { break; }
+        if !c.is_digit() { break; }
         exitcode = exitcode * 10 + match c {
             '0' ... '9' => c as int - ('0' as int),
             _ => 101,
@@ -1672,8 +1672,7 @@ fn compile_test_and_save_bitcode(config: &Config, props: &TestProps,
     let args = make_compile_args(config,
                                  props,
                                  link_args,
-                                 |a, b| TargetLocation::ThisDirectory(
-                                     output_base_name(a, b).dir_path()),
+                                 |a, b| ThisDirectory(output_base_name(a, b).dir_path()),
                                  testfile);
     compose_and_run_compiler(config, props, testfile, args, None)
 }

branches/snap-stage3/mk/cfg/i686-pc-windows-gnu.mk renamed to branches/snap-stage3/mk/cfg/i686-pc-windows-gnu

@@ -3144,8 +3144,8 @@ pub fn add_three_times_four(x: int) -> int {
 }
 ```
 
-We're calling this file `lib.rs`, because Cargo uses that filename as the crate
-root by convention.
+We're calling this file `lib.rs` because it has the same name as our project,
+and so it's named this, by convention.
 
 We'll then need to use this crate in our `src/main.rs`:
 

branches/snap-stage3/mk/cfg/i686-unknown-linux-gnu.mk renamed to branches/snap-stage3/mk/cfg/i686-unknown-linux-gnu

@@ -1334,12 +1334,7 @@ specific type; the type-specified aspects of a value include:
 For example, the type `(u8, u8)` defines the set of immutable values that are
 composite pairs, each containing two unsigned 8-bit integers accessed by
 pattern-matching and laid out in memory with the `x` component preceding the
-`y` component:
-
-```
-type Point = (u8, u8);
-let p: Point = (41, 68);
-```
+`y` component.
 
 ### Structures
 

branches/snap-stage3/mk/cfg/mips-unknown-linux-gnu.mk renamed to branches/snap-stage3/mk/cfg/mips-unknown-linux-gnu

@@ -43,6 +43,8 @@ def print_struct_val(val, internal_dict):
     return print_struct_val_starting_from(0, val, internal_dict)
 
 def print_vec_slice_val(val, internal_dict):
+  output = "&["
+
   length = val.GetChildAtIndex(1).GetValueAsUnsigned()
 
   data_ptr_val = val.GetChildAtIndex(0)
@@ -54,12 +56,16 @@ def print_vec_slice_val(val, internal_dict):
 
   start_address = data_ptr_val.GetValueAsUnsigned()
 
-  def render_element(i):
+  for i in range(length):
     address = start_address + i * element_type_size
-    element_val = val.CreateValueFromAddress( val.GetName() + ("[%s]" % i), address, element_type)
-    return print_val(element_val, internal_dict)
+    element_val = val.CreateValueFromAddress( val.GetName() + ("[%s]" % i), address, element_type )
+    output += print_val(element_val, internal_dict)
+
+    if i != length - 1:
+      output += ", "
 
-  return "&[%s]" % (', '.join([render_element(i) for i in range(length)]))
+  output += "]"
+  return output
 
 def print_struct_val_starting_from(field_start_index, val, internal_dict):
   '''
@@ -71,33 +77,39 @@ def print_struct_val_starting_from(field_start_index, val, internal_dict):
   t = val.GetType()
   has_field_names = type_has_field_names(t)
   type_name = extract_type_name(t.GetName())
+  output = ""
+
+  if not type_name.startswith("("):
+    # this is a tuple, so don't print the type name
+    output += type_name
 
   if has_field_names:
-      template = "%(type_name)s {\n%(body)s\n}"
-      separator = ", \n"
+    output += " { \n"
   else:
-      template = "%(type_name)s(%(body)s)"
-      separator = ", "
-
-  if type_name.startswith("("):
-    # this is a tuple, so don't print the type name
-    type_name = ""
+    output += "("
 
   num_children = val.num_children
 
-  def render_child(child_index):
-    this = ""
+  for child_index in range(field_start_index, num_children):
     if has_field_names:
       field_name = t.GetFieldAtIndex(child_index).GetName()
-      this += field_name + ": "
+      output += field_name + ": "
 
     field_val = val.GetChildAtIndex(child_index)
-    return this + print_val(field_val, internal_dict)
+    output += print_val(field_val, internal_dict)
 
-  body = separator.join([render_child(idx) for idx in range(field_start_index, num_children)])
+    if child_index != num_children - 1:
+      output += ", "
+
+    if has_field_names:
+      output += "\n"
+
+  if has_field_names:
+    output += "}"
+  else:
+    output += ")"
 
-  return template % {"type_name": type_name,
-                     "body": body}
+  return output
 
 
 def print_enum_val(val, internal_dict):
@@ -231,5 +243,3 @@ def is_vec_slice(val):
 
   type_name = extract_type_name(ty.GetName()).replace("&'static", "&").replace(" ", "")
   return type_name.startswith("&[") and type_name.endswith("]")
-
-# vi: sw=2:ts=2

branches/snap-stage3/mk/cfg/mipsel-unknown-linux-gnu.mk renamed to branches/snap-stage3/mk/cfg/mipsel-unknown-linux-gnu

@@ -1,35 +1,29 @@
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <[email protected]>
-" Latest Revision:  2014 Sep 24
+" Latest Revision:  2014 Sep 18
 
-if exists('current_compiler')
+if exists("current_compiler")
   finish
 endif
-runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
-if exists(':CompilerSet') != 2
+if exists(":CompilerSet") != 2
     command -nargs=* CompilerSet setlocal <args>
 endif
 
-if exists('g:cargo_makeprg_params')
-    execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
-else
-    CompilerSet makeprg=cargo\ $*
-endif
+CompilerSet errorformat&
+CompilerSet makeprg=cargo\ $*
 
 " Allow a configurable global Cargo.toml name. This makes it easy to
 " support variations like 'cargo.toml'.
-let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
+if !exists('g:cargo_toml_name')
+    let g:cargo_toml_name = 'Cargo.toml'
+endif
 
-function! s:is_absolute(path)
-    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
-endfunction
+let s:toml_dir = fnamemodify(findfile(g:cargo_toml_name, '.;'), ':p:h').'/'
 
-let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
-if s:local_manifest != ''
-    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
+if s:toml_dir != ''
     augroup cargo
         au!
         au QuickfixCmdPost make call s:FixPaths()
@@ -39,25 +33,15 @@ if s:local_manifest != ''
     " to be relative to the current directory instead of Cargo.toml.
     function! s:FixPaths()
         let qflist = getqflist()
-        let manifest = s:local_manifest
         for qf in qflist
-            if !qf.valid
-                let m = matchlist(qf.text, '(file://\(.*\))$')
-                if !empty(m)
-                    let manifest = m[1].'/'
-                    " Manually strip another slash if needed; usually just an
-                    " issue on Windows.
-                    if manifest =~ '^/[A-Z]\+:/'
-                        let manifest = manifest[1:]
-                    endif
-                endif
+            if !qf['valid']
                 continue
             endif
-            let filename = bufname(qf.bufnr)
-            if s:is_absolute(filename)
-                continue
+            let filename = bufname(qf['bufnr'])
+            if stridx(filename, s:toml_dir) == -1
+                let filename = s:toml_dir.filename
             endif
-            let qf.filename = simplify(manifest.filename)
+            let qf['filename'] = simplify(s:toml_dir.bufname(qf['bufnr']))
             call remove(qf, 'bufnr')
         endfor
         call setqflist(qflist, 'r')

branches/snap-stage3/mk/cfg/x86_64-apple-darwin.mk renamed to branches/snap-stage3/mk/cfg/x86_64-apple-darwin

@@ -53,15 +53,6 @@ g:rust_conceal_pub~
 	    let g:rust_conceal_pub = 1
 <
 
-                                                     *g:rust_recommended_style*
-g:rust_recommended_style~
-        Set this option to enable vim indentation and textwidth settings to
-        conform to style conventions of the rust standard library (i.e. use 4
-        spaces for indents and sets 'textwidth' to 99). This option is enabled
-	by default. To disable it: >
-	    let g:rust_recommended_style = 0
-<
-
                                                                  *g:rust_fold*
 g:rust_fold~
 	Set this option to turn on |folding|: >
@@ -88,13 +79,6 @@ g:ftplugin_rust_source_path~
 	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
 <
 
-                                                       *g:cargo_manifest_name*
-g:cargo_manifest_name~
-	Set this option to the name of the manifest file for your projects. If
-	not specified it defaults to 'Cargo.toml' : >
-	    let g:cargo_manifest_name = 'Cargo.toml'
-<
-
 ==============================================================================
 COMMANDS                                                       *rust-commands*
 

branches/snap-stage3/mk/cfg/x86_64-pc-windows-gnu.mk renamed to branches/snap-stage3/mk/cfg/x86_64-pc-windows-gnu

@@ -35,10 +35,9 @@ silent! setlocal formatoptions+=j
 " otherwise it's better than nothing.
 setlocal smartindent nocindent
 
-if !exists("g:rust_recommended_style") || g:rust_recommended_style == 1
-	setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
-	setlocal textwidth=99
-endif
+setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
+
+setlocal textwidth=99
 
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')