---

yaml
---
r: 125119
b: refs/heads/master
c: 6444b5e
h: refs/heads/master
i:
  125117: ddc08d2
  125115: e728850
  125111: b8797a8
  125103: d2ea17f
  125087: fd80732
  125055: 5c7a026
v: v3

Author: Gankra

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d114ddac030d6ed63b3076ccc0e7db081c0a9409
+refs/heads/master: 6444b5e82bd06dd1fb907221d6c91464276532c5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
 refs/heads/try: e1ef32c61a81d3655803acf1d21eafb7fb360be6

trunk/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

trunk/mk/tests.mk

@@ -171,41 +171,28 @@ endif
 # Main test targets
 ######################################################################
 
-# The main testing target. Tests lots of stuff.
 check: cleantmptestlogs cleantestlibs check-notidy tidy
 
-# As above but don't bother running tidy.
 check-notidy: cleantmptestlogs cleantestlibs all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# A slightly smaller set of tests for smoke testing.
 check-lite: cleantestlibs cleantmptestlogs \
 	$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
 	check-stage2-rpass \
 	check-stage2-rfail check-stage2-cfail check-stage2-rmake
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# Only check the 'reference' tests: rpass/cfail/rfail/rmake.
 check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
 	check-stage2-rfail check-stage2-cfail check-stage2-rmake
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# Only check the docs.
 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
-
-# check + check-secondary.
-check-all: check check-secondary
-
-# Pretty-printing tests.
-check-pretty: check-stage2-T-$(CFG_BUILD)-H-$(CFG_BUILD)-pretty-exec
+check-syntax: check-lexer
 
 .PHONY: cleantmptestlogs cleantestlibs
 

trunk/src/doc/guide-lifetimes.md

@@ -77,7 +77,7 @@ value. We also call this _borrowing_ the local variable
 `on_the_stack`, because we have created an alias: that is, another
 name for the same data.
 
-Likewise, in the case of `on_the_heap`,
+Likewise, in the case of `owned_box`,
 the `&` operator is used in conjunction with the `*` operator
 to take a reference to the contents of the box.