---

yaml
---
r: 165695
b: refs/heads/auto
c: cfc815b
h: refs/heads/master
i:
  165693: 5375ec0
  165691: 730b1af
  165687: 3635be8
  165679: 90fcf06
  165663: 546f7f0
  165631: 63e04e2
v: v3

Author: alexcrichton

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: e5d8c855079e08e1aab2cf7b4e5110159ad8fa53
+refs/heads/auto: cfc815bef4b7fec0f77255188b582b4b7b5e73ca
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/crates.mk

@@ -53,7 +53,8 @@ TARGET_CRATES := libc std flate arena term \
                  serialize getopts collections test time rand \
                  log regex graphviz core rbml alloc \
                  unicode
-RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_driver rustc_trans rustc_back rustc_llvm 
+RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
+                rustc_trans rustc_back rustc_llvm
 HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc regex_macros fmt_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
@@ -67,11 +68,12 @@ DEPS_std := core libc rand alloc collections unicode \
 DEPS_graphviz := std
 DEPS_syntax := std term serialize log fmt_macros arena libc
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
-                     rustc_typeck log syntax serialize rustc_llvm rustc_trans
+                     rustc_typeck rustc_resolve log syntax serialize rustc_llvm rustc_trans
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
 	                log syntax serialize rustc_llvm
 DEPS_rustc_typeck := rustc syntax
 DEPS_rustc_borrowck := rustc log graphviz syntax
+DEPS_rustc_resolve := rustc log syntax
 DEPS_rustc := syntax flate arena serialize getopts rbml \
               time log graphviz rustc_llvm rustc_back
 DEPS_rustc_llvm := native:rustllvm libc std
@@ -118,9 +120,11 @@ DOC_CRATES := $(filter-out rustc, \
               $(filter-out rustc_trans, \
               $(filter-out rustc_typeck, \
               $(filter-out rustc_borrowck, \
+              $(filter-out rustc_resolve, \
               $(filter-out rustc_driver, \
-              $(filter-out syntax, $(CRATES)))))))
-COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_typeck rustc_driver syntax
+              $(filter-out syntax, $(CRATES))))))))
+COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
+                       rustc_typeck rustc_driver syntax
 
 # This macro creates some simple definitions for each crate being built, just
 # some munging of all of the parameters above.

branches/auto/mk/docs.mk

@@ -216,36 +216,6 @@ endef
 $(foreach docname,$(DOCS),$(eval $(call DEF_DOC,$(docname))))
 
 
-# Localized documentation
-
-# FIXME: I (huonw) haven't actually been able to test properly, since
-# e.g. (by default) I'm doing an out-of-tree build (#12763), but even
-# adjusting for that, the files are too old(?) and are rejected by
-# po4a.
-#
-# As such, I've attempted to get it working as much as possible (and
-# switching from pandoc to rustdoc), but preserving the old behaviour
-# (e.g. only running on the guide)
-.PHONY: l10n-mds
-l10n-mds: $(D)/po4a.conf \
-		$(foreach lang,$(L10N_LANG),$(D)/po/$(lang)/*.md.po)
-	$(warning WARNING: localized documentation is experimental)
-	po4a --copyright-holder="The Rust Project Developers" \
-		--package-name="Rust" \
-		--package-version="$(CFG_RELEASE)" \
-		-M UTF-8 -L UTF-8 \
-		$(D)/po4a.conf
-
-define DEF_L10N_DOC
-DOC_L10N_TARGETS += doc/l10n/$(1)/$(2).html
-doc/l10n/$(1)/$(2).html: l10n-mds $$(HTML_DEPS) $$(RUSTDOC_DEPS_$(2))
-	@$$(call E, rustdoc: $$@)
-	$$(RUSTDOC) $$(RUSTDOC_HTML_OPTS) $$(RUSTDOC_FLAGS_$(1)) doc/l10n/$(1)/$(2).md
-endef
-
-$(foreach lang,$(L10N_LANGS),$(eval $(call DEF_L10N_DOC,$(lang),guide)))
-
-
 ######################################################################
 # Rustdoc (libstd/extra)
 ######################################################################
@@ -294,7 +264,3 @@ endif
 
 docs: $(DOC_TARGETS)
 compiler-docs: $(COMPILER_DOC_TARGETS)
-
-docs-l10n: $(DOC_L10N_TARGETS)
-
-.PHONY: docs-l10n

branches/auto/mk/tests.mk

@@ -21,7 +21,8 @@ $(eval $(call RUST_CRATE,coretest))
 
 TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) coretest
 TEST_DOC_CRATES = $(DOC_CRATES)
-TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_trans,$(HOST_CRATES))
+TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_resolve rustc_trans,\
+                     $(HOST_CRATES))
 TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
 
 ######################################################################
@@ -299,7 +300,7 @@ tidy:
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_HS) \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
-		$(Q)find $(S)src -type f -perm +a+x \
+		$(Q)find $(S)src -type f -perm /a+x \
 		    -not -name '*.rs' -and -not -name '*.py' \
 		    -and -not -name '*.sh' \
 		| grep '^$(S)src/jemalloc' -v \

branches/auto/src/compiletest/runtest.rs

@@ -1609,7 +1609,7 @@ fn _arm_exec_compiled_test(config: &Config,
                 stderr_out.as_slice());
 
     ProcRes {
-        status: process::ExitStatus(exitcode),
+        status: process::ProcessExit::ExitStatus(exitcode),
         stdout: stdout_out,
         stderr: stderr_out,
         cmdline: cmdline
@@ -1666,7 +1666,7 @@ fn compile_test_and_save_bitcode(config: &Config, props: &TestProps,
     // FIXME (#9639): This needs to handle non-utf8 paths
     let mut link_args = vec!("-L".to_string(),
                              aux_dir.as_str().unwrap().to_string());
-    let llvm_args = vec!("--emit=bc,obj".to_string(),
+    let llvm_args = vec!("--emit=llvm-bc,obj".to_string(),
                          "--crate-type=lib".to_string());
     link_args.extend(llvm_args.into_iter());
     let args = make_compile_args(config,

branches/auto/src/doc/README.md

@@ -6,12 +6,6 @@
 document converter, is required to generate docs as HTML from Rust's
 source code.
 
-[po4a](http://po4a.alioth.debian.org/) is required for generating translated
-docs from the master (English) docs.
-
-[GNU gettext](http://www.gnu.org/software/gettext/) is required for managing
-the translation data.
-
 ## Building
 
 To generate all the docs, just run `make docs` from the root of the repository.
@@ -44,43 +38,3 @@ The syntax for pandoc flavored markdown can be found at:
 A nice quick reference (for non-pandoc markdown) is at:
 
 - http://kramdown.gettalong.org/quickref.html
-
-## Notes for translators
-
-Notice: The procedure described below is a work in progress. We are working on
-translation system but the procedure contains some manual operations for now.
-
-To start the translation for a new language, see `po4a.conf` at first.
-
-To generate `.pot` and `.po` files, do something like:
-
-~~~~
-po4a --copyright-holder="The Rust Project Developers" \
-    --package-name="Rust" \
-    --package-version="0.13.0" \
-    -M UTF-8 -L UTF-8 \
-    src/doc/po4a.conf
-~~~~
-
-(the version number must be changed if it is not `0.13.0` now.)
-
-Now you can translate documents with `.po` files, commonly used with gettext. If
-you are not familiar with gettext-based translation, please read the online
-manual linked from http://www.gnu.org/software/gettext/ . We use UTF-8 as the
-file encoding of `.po` files.
-
-When you want to make a commit, do the command below before staging your
-change:
-
-~~~~
-for f in src/doc/po/**/*.po; do
-    msgattrib --translated $f -o $f.strip
-    if [ -e $f.strip ]; then
-       mv $f.strip $f
-    else
-       rm $f
-    fi
-done
-~~~~
-
-This removes untranslated entries from `.po` files to save disk space.

branches/auto/src/doc/guide-ownership.md

@@ -324,7 +324,7 @@ fn main() {
     let f = Foo { x: y }; // -+ f goes into scope
     // stuff              //  |
                           //  |
-}                         // -+ f & y go out of scope
+}                         // -+ f and y go out of scope
 ```
 
 Our `f` lives within the scope of `y`, so everything works. What if it didn't?
@@ -342,7 +342,7 @@ fn main() {
         let y = &5i;          // ---+ y goes into scope
         let f = Foo { x: y }; // ---+ f goes into scope
         x = &f.x;             //  | | error here
-    }                         // ---+ f & y go out of scope
+    }                         // ---+ f and y go out of scope
                               //  |
     println!("{}", x);        //  |
 }                             // -+ x goes out of scope
@@ -395,7 +395,7 @@ struct Wheel {
 }
 
 fn main() {
-    let car = Car { name: "DeLorian".to_string() };
+    let car = Car { name: "DeLorean".to_string() };
 
     for _ in range(0u, 4) {
         Wheel { size: 360, owner: car };
@@ -431,7 +431,7 @@ struct Wheel {
 }
 
 fn main() {
-    let car = Car { name: "DeLorian".to_string() };
+    let car = Car { name: "DeLorean".to_string() };
 
     let car_owner = Rc::new(car);