---

yaml
---
r: 126459
b: refs/heads/auto
c: 8a7b0fa
h: refs/heads/master
i:
  126457: 35fa9d5
  126455: 2d89ef0
v: v3

Author: James Hurst

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8fcfd02d852cc328a1d465f366ff8e22583b26f2
+refs/heads/auto: 8a7b0fa939c4e1ae8dcbba941ab4d46a3602b9fe
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/.gitignore

@@ -1,94 +1,90 @@
-*.a
-*.aux
-*.bc
+*~
+\#*\#
+\#*
+.#*
+*.x86
+*.llvm
+*.out
 *.boot
-*.bz2
-*.cmi
-*.cmo
+*.rustc
 *.cmx
-*.cp
-*.cps
-*.d
-*.dSYM
-*.def
-*.diff
 *.dll
-*.dylib
-*.elc
-*.epub
+*.def
 *.exe
+*.a
+*.rlib
+*.so
+*.dylib
+*.orig
+*.cmo
+*.cmi
+*.dSYM
+*.d
+*.o
+*.ll
+*.bc
+*.aux
+*.cp
 *.fn
-*.html
 *.ky
-*.ll
-*.llvm
+*.cps
 *.log
-*.o
-*.orig
-*.out
-*.patch
 *.pdf
+*.epub
+*.html
 *.pg
-*.pot
-*.pyc
-*.rej
-*.rlib
-*.rustc
-*.so
-*.swo
-*.swp
-*.tmp
 *.toc
 *.tp
 *.vr
-*.x86
-*~
-.#*
-.DS_Store
-.cproject
+*.patch
+*.diff
+*.rej
+*.swp
+*.swo
+*.tmp
+*.pyc
+*.elc
 .hg/
 .hgignore
+.cproject
 .project
-.settings/
 .valgrindrc
-/*-*-*-*/
-/*-*-*/
+lexer.ml
+TAGS
+TAGS.emacs
+TAGS.vi
+version.ml
+version.texi
 /Makefile
-/build
-/dist/
-/dl/
-/doc
-/inst/
-/llvm/
-/mingw-build/
-/nd/
+config.mk
 /rt/
 /rustllvm/
-/src/libunicode/DerivedCoreProperties.txt
-/src/libunicode/EastAsianWidth.txt
-/src/libunicode/HangulSyllableType.txt
-/src/libunicode/PropList.txt
-/src/libunicode/Scripts.txt
-/src/libunicode/UnicodeData.txt
+/test/
+/inst/
+/mingw-build/
+src/.DS_Store
+/tmp/
+/dist/
 /stage0/
+/dl/
 /stage1/
 /stage2/
 /stage3/
-/test/
-/tmp/
-TAGS
-TAGS.emacs
-TAGS.vi
-\#*
-\#*\#
-config.mk
-config.stamp
+*.bz2
+/doc
+/nd/
+/llvm/
+version.md
 keywords.md
-lexer.ml
-src/.DS_Store
+x86_64-apple-darwin/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
+tmp.*.rs
+config.stamp
+.DS_Store
 src/etc/dl
+.settings/
+/build
+i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-tmp.*.rs
-version.md
-version.ml
-version.texi
+*.pot

branches/auto/configure

@@ -291,10 +291,6 @@ case $CFG_OSTYPE in
         CFG_OSTYPE=unknown-freebsd
         ;;
 
-    DragonFly)
-        CFG_OSTYPE=unknown-dragonfly
-        ;;
-
     Darwin)
         CFG_OSTYPE=apple-darwin
         ;;

branches/auto/mk/clean.mk

@@ -12,21 +12,21 @@
 # Cleanup
 ######################################################################
 
-CLEAN_STAGE_RULES := \
- $(foreach stage, $(STAGES), \
-  $(foreach host, $(CFG_HOST), \
-   clean$(stage)_H_$(host) \
-   $(foreach target, $(CFG_TARGET), \
+CLEAN_STAGE_RULES :=							\
+ $(foreach stage, $(STAGES),						\
+  $(foreach host, $(CFG_HOST),						\
+   clean$(stage)_H_$(host)						\
+   $(foreach target, $(CFG_TARGET),					\
     clean$(stage)_T_$(target)_H_$(host))))
 
-CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
+CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES)				\
     $(foreach host, $(CFG_HOST), clean-generic-H-$(host))
 
-CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
+CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES)				\
     $(foreach host, $(CFG_TARGET), clean-generic-T-$(host))
 
-CLEAN_LLVM_RULES = \
- $(foreach target, $(CFG_HOST), \
+CLEAN_LLVM_RULES = 								\
+ $(foreach target, $(CFG_HOST),		\
   clean-llvm$(target))
 
 .PHONY: clean clean-all clean-misc clean-llvm
@@ -54,20 +54,20 @@ clean-generic-$(2)-$(1):
 	         $(1)/rt \
 		 $(1)/test \
 		 $(1)/stage* \
-		 -type f \( \
+		 -type f \(           \
          -name '*.[odasS]' -o \
-         -name '*.so' -o \
-         -name '*.dylib' -o \
-         -name '*.rlib' -o \
-         -name 'stamp.*' -o \
-         -name '*.lib' -o \
-         -name '*.dll' -o \
-         -name '*.def' -o \
-         -name '*.bc' \
-         \) \
+         -name '*.so' -o      \
+         -name '*.dylib' -o   \
+         -name '*.rlib' -o   \
+         -name 'stamp.*' -o   \
+         -name '*.lib' -o     \
+         -name '*.dll' -o     \
+         -name '*.def' -o     \
+         -name '*.bc'         \
+         \)                   \
          | xargs rm -f
-	$(Q)find $(1) \
-         -name '*.dSYM' \
+	$(Q)find $(1)\
+         -name '*.dSYM'       \
          | xargs rm -Rf
 endef
 
@@ -76,8 +76,8 @@ $(foreach targ, $(CFG_TARGET), $(eval $(call CLEAN_GENERIC,$(targ),T)))
 
 define CLEAN_HOST_STAGE_N
 
-clean$(1)_H_$(2): \
-	    $$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
+clean$(1)_H_$(2):							    \
+	    $$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate))	    \
 	    $$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
 	$$(Q)rm -fr $(2)/rt/libbacktrace
 
@@ -96,8 +96,8 @@ $(foreach host, $(CFG_HOST), \
 
 define CLEAN_TARGET_STAGE_N
 
-clean$(1)_T_$(2)_H_$(3): \
-	    $$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
+clean$(1)_T_$(2)_H_$(3):						       \
+	    $$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate))  \
 	    $$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
 	$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
 	$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a

branches/auto/mk/crates.mk

@@ -51,7 +51,7 @@
 
 TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
-                 url log regex graphviz core rbml rlibc alloc debug rustrt \
+                 url log regex graphviz core rlibc alloc debug rustrt \
                  unicode
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros \
 	       rustc_llvm rustc_back
@@ -71,7 +71,7 @@ DEPS_green := std native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
 DEPS_syntax := std term serialize log fmt_macros debug
-DEPS_rustc := syntax flate arena serialize getopts rbml \
+DEPS_rustc := syntax flate arena serialize getopts \
               time log graphviz debug rustc_llvm rustc_back
 DEPS_rustc_llvm := native:rustllvm libc std
 DEPS_rustc_back := std syntax rustc_llvm flate log libc
@@ -82,7 +82,6 @@ DEPS_arena := std
 DEPS_graphviz := std
 DEPS_glob := std
 DEPS_serialize := std log
-DEPS_rbml := std log serialize
 DEPS_term := std log
 DEPS_semver := std
 DEPS_uuid := std serialize
@@ -92,7 +91,7 @@ DEPS_collections := core alloc unicode
 DEPS_fourcc := rustc syntax std
 DEPS_hexfloat := rustc syntax std
 DEPS_num := std
-DEPS_test := std getopts serialize rbml term time regex native:rust_test_helpers
+DEPS_test := std getopts serialize term time regex native:rust_test_helpers
 DEPS_time := std serialize
 DEPS_rand := core
 DEPS_url := std

branches/auto/mk/ctags.mk

@@ -18,18 +18,18 @@
 # This is using a blacklist approach, probably more durable than a whitelist.
 # We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
 # tests (compiletest, test) and a couple of other things (rt/arch, etc)
-CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
-				$(patsubst ${CFG_SRC_DIR}src/libuv,, \
-				$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
-				$(patsubst ${CFG_SRC_DIR}src/test,, \
-				$(patsubst ${CFG_SRC_DIR}src/gyp,, \
-				$(patsubst ${CFG_SRC_DIR}src/etc,, \
-				$(patsubst ${CFG_SRC_DIR}src/rt,, \
-				$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
-				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
-				$(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
-				$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
-				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
+CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
+				$(patsubst ${CFG_SRC_DIR}src/libuv,,\
+				$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
+				$(patsubst ${CFG_SRC_DIR}src/test,,\
+				$(patsubst ${CFG_SRC_DIR}src/gyp,,\
+				$(patsubst ${CFG_SRC_DIR}src/etc,,\
+				$(patsubst ${CFG_SRC_DIR}src/rt,,\
+				$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
+				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
+				$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
+				$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
+				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
 				)))))))))))
 CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
 # We could use `--languages=Rust`, but there is value in producing tags for the

branches/auto/mk/docs.mk

@@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
 doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
                        $(wildcard $(D)/*.*) | doc/
 	@$(call E, version-info: $@)
-	$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \
-                    CFG_SHORT_VER_HASH)/; \
+	$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(\
+                    CFG_SHORT_VER_HASH)/;\
                 s/STAMP/$(CFG_VER_HASH)/;" $< >$@
 
 GENERATED += doc/version.tex doc/version_info.html
@@ -285,7 +285,7 @@ doc/$(1)/:
 $(2) += doc/$(1)/index.html
 doc/$(1)/index.html: CFG_COMPILER_HOST_TRIPLE = $(CFG_TARGET)
 doc/$(1)/index.html: $$(LIB_DOC_DEP_$(1)) doc/$(1)/
-	@$$(call E, rustdoc: $$@)
+	@$$(call E, rustdoc $$@)
 	$$(Q)$$(RUSTDOC) --cfg dox --cfg stage2 $$<
 endef
 

branches/auto/mk/grammar.mk

@@ -13,7 +13,7 @@ SG = $(S)src/grammar/
 B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
 L = $(B)lib/rustlib/$(CFG_BUILD)/lib
 LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
-RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
+RUSTC = $(B)bin/rustc
 
 # Run the reference lexer against libsyntax and compare the tokens and spans.
 # If "// ignore-lexer-test" is present in the file, it will be ignored.
@@ -37,25 +37,19 @@ $(BG)RustLexer.class: $(SG)RustLexer.g4
 $(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
 	$(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs
 
+check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
 ifdef CFG_JAVAC
 ifdef CFG_ANTLR4
 ifdef CFG_GRUN
-check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
 	$(info Verifying libsyntax against the reference lexer ...)
 	$(Q)$(SG)check.sh $(S) "$(BG)" \
 		"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
 else
-$(info cfg: grun not available, skipping lexer test...)
-check-lexer:
-
+$(info grun not available, skipping lexer test...)
 endif
 else
-$(info cfg: antlr4 not available, skipping lexer test...)
-check-lexer:
-
+$(info antlr4 not available, skipping lexer test...)
 endif
 else
-$(info cfg: javac not available, skipping lexer test...)
-check-lexer:
-
+$(info javac not available, skipping lexer test...)
 endif