Skip to content

Commit 0045043

Browse files
author
Alfie John
committed
---
yaml --- r: 160251 b: refs/heads/snap-stage3 c: e0b0c83 h: refs/heads/master i: 160249: 85739bb 160247: d6ebfe4 v: v3
1 parent f336943 commit 0045043

File tree

136 files changed

+1191
-1937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1191
-1937
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: bfaa7bcab3459907014c31d3bf980f65ccd14b08
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 793624261a221aa4592381fa8067e1f597b90c22
4+
refs/heads/snap-stage3: e0b0c83138236ba1b2d532f79647ee45f7824741
55
refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,6 @@ do
10311031
make_dir $h/test/doc-guide-tasks
10321032
make_dir $h/test/doc-guide-plugin
10331033
make_dir $h/test/doc-guide-crates
1034-
make_dir $h/test/doc-guide-error-handling
10351034
make_dir $h/test/doc-rust
10361035
done
10371036

‎branches/snap-stage3/mk/docs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
######################################################################
2828
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
2929
guide-tasks guide-container guide-pointers guide-testing \
30-
guide-plugin guide-crates complement-bugreport guide-error-handling \
30+
guide-plugin guide-crates complement-bugreport \
3131
complement-lang-faq complement-design-faq complement-project-faq \
3232
rustdoc guide-unsafe guide-strings reference
3333

‎branches/snap-stage3/mk/grammar.mk

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,17 @@ endef
3030
$(BG):
3131
$(Q)mkdir -p $(BG)
3232

33-
$(BG)RustLexer.class: $(BG) $(SG)RustLexer.g4
33+
$(BG)RustLexer.class: $(SG)RustLexer.g4
3434
$(Q)$(CFG_ANTLR4) -o $(B)grammar $(SG)RustLexer.g4
3535
$(Q)$(CFG_JAVAC) -d $(BG) $(BG)RustLexer.java
3636

37-
check-build-lexer-verifier: $(BG)verify
38-
39-
ifeq ($(NO_REBUILD),)
40-
VERIFY_DEPS := rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
41-
else
42-
VERIFY_DEPS :=
43-
endif
44-
45-
$(BG)verify: $(BG) $(SG)verify.rs $(VERIFY_DEPS)
46-
$(Q)$(RUSTC) --out-dir $(BG) -L $(L) $(SG)verify.rs
37+
$(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
38+
$(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs
4739

4840
ifdef CFG_JAVAC
4941
ifdef CFG_ANTLR4
5042
ifdef CFG_GRUN
51-
check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
43+
check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
5244
$(info Verifying libsyntax against the reference lexer ...)
5345
$(Q)$(SG)check.sh $(S) "$(BG)" \
5446
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"

‎branches/snap-stage3/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
199199

200200
# Some less critical tests that are not prone to breakage.
201201
# Not run as part of the normal test suite, but tested by bors on checkin.
202-
check-secondary: check-build-compiletest check-build-lexer-verifier check-lexer check-pretty
202+
check-secondary: check-build-compiletest check-lexer check-pretty
203203

204204
# check + check-secondary.
205205
#

‎branches/snap-stage3/src/doc/guide-error-handling.md

Lines changed: 0 additions & 228 deletions
This file was deleted.

‎branches/snap-stage3/src/doc/guide.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ $ ./main # or main.exe on Windows
159159
Hello, world!
160160
```
161161

162-
You can also run these examples on [play.rust-lang.org](http://play.rust-lang.org/) by clicking on the arrow that appears in the upper right of the example when you mouse over the code.
163-
164162
Success! Let's go over what just happened in detail.
165163

166164
```{rust}

‎branches/snap-stage3/src/doc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ a guide that can help you out:
5959
* [References and Lifetimes](guide-lifetimes.html)
6060
* [Crates and modules](guide-crates.html)
6161
* [Tasks and Communication](guide-tasks.html)
62-
* [Error Handling](guide-error-handling.html)
6362
* [Foreign Function Interface](guide-ffi.html)
6463
* [Writing Unsafe and Low-Level Code](guide-unsafe.html)
6564
* [Macros](guide-macros.html)

‎branches/snap-stage3/src/doc/po4a.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
[type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md
2121
[type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-unsafe.md
2222
[type: text] src/doc/guide-crates.md $lang:doc/l10n/$lang/guide-crates.md
23-
[type: text] src/doc/guide-error-handling.md $lang:doc/l10n/$lang/guide-error-handling.md
2423
[type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md
2524
[type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md
2625
[type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md

0 commit comments

Comments
 (0)