---

yaml
---
r: 154101
b: refs/heads/try2
c: e5df5f5
h: refs/heads/master
i:
  154099: 5580f91
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8a7b0fa939c4e1ae8dcbba941ab4d46a3602b9fe
+refs/heads/try2: e5df5f56069de2778857597118a6e5f95d659736
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

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

branches/try2/configure

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

branches/try2/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/try2/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 rlibc alloc debug rustrt \
+                 url log regex graphviz core rbml 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 \
+DEPS_rustc := syntax flate arena serialize getopts rbml \
               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,6 +82,7 @@ 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
@@ -91,7 +92,7 @@ DEPS_collections := core alloc unicode
 DEPS_fourcc := rustc syntax std
 DEPS_hexfloat := rustc syntax std
 DEPS_num := std
-DEPS_test := std getopts serialize term time regex native:rust_test_helpers
+DEPS_test := std getopts serialize rbml term time regex native:rust_test_helpers
 DEPS_time := std serialize
 DEPS_rand := core
 DEPS_url := std

branches/try2/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/try2/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/try2/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 = $(B)bin/rustc
+RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
 
 # 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,19 +37,25 @@ $(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 grun not available, skipping lexer test...)
+$(info cfg: grun not available, skipping lexer test...)
+check-lexer:
+
 endif
 else
-$(info antlr4 not available, skipping lexer test...)
+$(info cfg: antlr4 not available, skipping lexer test...)
+check-lexer:
+
 endif
 else
-$(info javac not available, skipping lexer test...)
+$(info cfg: javac not available, skipping lexer test...)
+check-lexer:
+
 endif