Skip to content

Commit 1737b4d

Browse files
lilyballlilyball
committed
---
yaml --- r: 178283 b: refs/heads/try c: a913fc6 h: refs/heads/master i: 178281: 844979f 178279: 946c704 v: v3
1 parent af5162c commit 1737b4d

File tree

600 files changed

+14182
-16356
lines changed

Some content is hidden

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

600 files changed

+14182
-16356
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 336c8d2e9c6b276b162bdb3edd43706372e6eddd
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 474b324eda10440d6568ef872a7307d38e7de95b
5-
refs/heads/try: 59dcba5d14e5eada0a5e7eb0cad5efc7acd1d0e3
5+
refs/heads/try: a913fc64d2f179dfcf7b11895f5b6c7c24d6979c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terms.
66

77
Longer version:
88

9-
The Rust Project is copyright 2015, The Rust Project
9+
The Rust Project is copyright 2014, The Rust Project
1010
Developers (given in the file AUTHORS.txt).
1111

1212
Licensed under the Apache License, Version 2.0

‎branches/try/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ documentation.
2121
1. Make sure you have installed the dependencies:
2222
* `g++` 4.7 or `clang++` 3.x
2323
* `python` 2.6 or later (but not 3.x)
24+
* `perl` 5.0 or later
2425
* GNU `make` 3.81 or later
2526
* `curl`
2627
* `git`

‎branches/try/configure

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ need_ok() {
2828

2929
need_cmd() {
3030
if command -v $1 >/dev/null 2>&1
31-
then msg "found program $1"
32-
else err "need program $1"
31+
then msg "found $1"
32+
else err "need $1"
3333
fi
3434
}
3535

@@ -340,7 +340,6 @@ need_cmd date
340340
need_cmd tr
341341
need_cmd sed
342342
need_cmd file
343-
need_cmd make
344343

345344
msg "inspecting environment"
346345

@@ -510,6 +509,7 @@ opt optimize-tests 1 "build tests with optimizations"
510509
opt libcpp 1 "build with llvm with libc++ instead of libstdc++ when using clang"
511510
opt llvm-assertions 1 "build LLVM with assertions"
512511
opt debug 1 "build with extra debug fun"
512+
opt ratchet-bench 0 "ratchet benchmarks"
513513
opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
514514
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
515515
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
@@ -617,6 +617,7 @@ putvar CFG_BOOTSTRAP_KEY
617617

618618
step_msg "looking for build programs"
619619

620+
probe_need CFG_PERL perl
620621
probe_need CFG_CURLORWGET curl wget
621622
probe_need CFG_PYTHON python2.7 python2.6 python2 python
622623

@@ -646,8 +647,6 @@ probe CFG_ISCC iscc
646647
probe CFG_JAVAC javac
647648
probe CFG_ANTLR4 antlr4
648649
probe CFG_GRUN grun
649-
probe CFG_FLEX flex
650-
probe CFG_BISON bison
651650
probe CFG_PANDOC pandoc
652651
probe CFG_PDFLATEX pdflatex
653652
probe CFG_XELATEX xelatex
@@ -1376,7 +1375,7 @@ do
13761375
done
13771376

13781377
# Munge any paths that appear in config.mk back to posix-y
1379-
sed -i.bak -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' config.tmp
1378+
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' config.tmp
13801379
rm -f config.tmp.bak
13811380

13821381
msg

‎branches/try/man/rustdoc.1

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,9 @@ space-separated list of plugins to run (default: '')
3535
--plugin-path <val>
3636
directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
3737
.TP
38-
--target <val>
39-
target triple to document
40-
.TP
41-
--crate-name <val>
42-
specify the name of this crate
43-
.TP
4438
-L --library-path <val>
4539
directory to add to crate search path
4640
.TP
47-
--cfg <val>
48-
pass a --cfg to rustc
49-
.TP
50-
--extern <val>
51-
pass an --extern to rustc
52-
.TP
53-
--test
54-
run code examples as tests
55-
.TP
56-
--test-args <val>
57-
pass arguments to the test runner
58-
.TP
5941
--html-in-header <val>
6042
file to add to <head>
6143
.TP
@@ -65,20 +47,8 @@ file to add in <body>, before content
6547
--html-after-content <val>
6648
file to add in <body>, after content
6749
.TP
68-
--markdown-css <val>
69-
CSS files to include via <link> in a rendered Markdown file
70-
.TP
71-
--markdown-playground-url <val>
72-
URL to send code snippets to
73-
.TP
74-
--markdown-no-toc
75-
don't include table of contents
76-
.TP
7750
-h, --help
7851
Print help
79-
.TP
80-
-V, --version
81-
Print rustdoc's version
8252

8353
.SH "OUTPUT FORMATS"
8454

‎branches/try/mk/cfg/aarch64-linux-android.mk

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

‎branches/try/mk/cfg/i686-pc-windows-gnu.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
12-
CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32
1515
CFG_GCCISH_DEF_FLAG_i686-pc-windows-gnu :=
@@ -22,7 +22,7 @@ CFG_EXE_SUFFIX_i686-pc-windows-gnu := .exe
2222
CFG_WINDOWSY_i686-pc-windows-gnu := 1
2323
CFG_UNIXY_i686-pc-windows-gnu :=
2424
CFG_PATH_MUNGE_i686-pc-windows-gnu :=
25-
CFG_LDPATH_i686-pc-windows-gnu :=
26-
CFG_RUN_i686-pc-windows-gnu=$(2)
27-
CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,,$(2))
25+
CFG_LDPATH_i686-pc-windows-gnu :=$(CFG_LDPATH_i686-pc-windows-gnu):$(PATH)
26+
CFG_RUN_i686-pc-windows-gnu=PATH="$(CFG_LDPATH_i686-pc-windows-gnu):$(1)" $(2)
27+
CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
2828
CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32

‎branches/try/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-gnu :=
@@ -22,7 +22,7 @@ CFG_EXE_SUFFIX_x86_64-pc-windows-gnu := .exe
2222
CFG_WINDOWSY_x86_64-pc-windows-gnu := 1
2323
CFG_UNIXY_x86_64-pc-windows-gnu :=
2424
CFG_PATH_MUNGE_x86_64-pc-windows-gnu :=
25-
CFG_LDPATH_x86_64-pc-windows-gnu :=
26-
CFG_RUN_x86_64-pc-windows-gnu=$(2)
27-
CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,,$(2))
25+
CFG_LDPATH_x86_64-pc-windows-gnu :=$(CFG_LDPATH_x86_64-pc-windows-gnu):$(PATH)
26+
CFG_RUN_x86_64-pc-windows-gnu=PATH="$(CFG_LDPATH_x86_64-pc-windows-gnu):$(1)" $(2)
27+
CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
2828
CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32

‎branches/try/mk/crates.mk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
54-
log graphviz core rbml alloc \
54+
log regex graphviz core rbml alloc \
5555
unicode rustc_bitflags
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5757
rustc_trans rustc_back rustc_llvm rustc_privacy
@@ -95,15 +95,16 @@ DEPS_term := std log
9595
DEPS_getopts := std
9696
DEPS_collections := core alloc unicode
9797
DEPS_num := std
98-
DEPS_test := std getopts serialize rbml term native:rust_test_helpers
98+
DEPS_test := std getopts serialize rbml term regex native:rust_test_helpers
9999
DEPS_rand := core
100-
DEPS_log := std
100+
DEPS_log := std regex
101+
DEPS_regex := std
101102
DEPS_fmt_macros = std
102103

103104
TOOL_DEPS_compiletest := test getopts
104105
TOOL_DEPS_rustdoc := rustdoc
105106
TOOL_DEPS_rustc := rustc_driver
106-
TOOL_DEPS_rustbook := std rustdoc
107+
TOOL_DEPS_rustbook := std regex rustdoc
107108
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
108109
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
109110
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
@@ -129,8 +130,9 @@ DOC_CRATES := $(filter-out rustc, \
129130
$(filter-out rustc_driver, \
130131
$(filter-out rustc_privacy, \
131132
$(filter-out log, \
133+
$(filter-out regex, \
132134
$(filter-out getopts, \
133-
$(filter-out syntax, $(CRATES)))))))))))
135+
$(filter-out syntax, $(CRATES))))))))))))
134136
COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
135137
rustc_typeck rustc_driver syntax rustc_privacy
136138

‎branches/try/mk/grammar.mk

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
1414
L = $(B)lib/rustlib/$(CFG_BUILD)/lib
1515
LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
1616
RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
17-
ifeq ($(CFG_OSTYPE),apple-darwin)
18-
FLEX_LDFLAGS=-ll
19-
else
20-
FLEX_LDFLAGS=-lfl
21-
endif
2217

2318
# Run the reference lexer against libsyntax and compare the tokens and spans.
2419
# If "// ignore-lexer-test" is present in the file, it will be ignored.
@@ -72,46 +67,3 @@ $(info cfg: javac not available, skipping lexer test...)
7267
check-lexer:
7368

7469
endif
75-
76-
$(BG)lex.yy.c: $(SG)lexer.l $(BG)
77-
@$(call E, flex: $@)
78-
$(Q)$(CFG_FLEX) -o $@ $<
79-
80-
$(BG)lexer-lalr.o: $(BG)lex.yy.c $(BG)parser-lalr.tab.h
81-
@$(call E, cc: $@)
82-
$(Q)$(CFG_CC) -include $(BG)parser-lalr.tab.h -c -o $@ $<
83-
84-
$(BG)parser-lalr.tab.c $(BG)parser-lalr.tab.h: $(SG)parser-lalr.y
85-
@$(call E, bison: $@)
86-
$(Q)$(CFG_BISON) $< --output=$(BG)parser-lalr.tab.c --defines=$(BG)parser-lalr.tab.h \
87-
--name-prefix=rs --warnings=error=all
88-
89-
$(BG)parser-lalr.o: $(BG)parser-lalr.tab.c
90-
@$(call E, cc: $@)
91-
$(Q)$(CFG_CC) -c -o $@ $<
92-
93-
$(BG)parser-lalr-main.o: $(SG)parser-lalr-main.c
94-
@$(call E, cc: $@)
95-
$(Q)$(CFG_CC) -std=c99 -c -o $@ $<
96-
97-
$(BG)parser-lalr: $(BG)parser-lalr.o $(BG)parser-lalr-main.o $(BG)lexer-lalr.o
98-
@$(call E, cc: $@)
99-
$(Q)$(CFG_CC) -o $@ $^ $(FLEX_LDFLAGS)
100-
101-
102-
ifdef CFG_FLEX
103-
ifdef CFG_BISON
104-
check-grammar: $(BG) $(BG)parser-lalr
105-
$(info Verifying grammar ...)
106-
$(SG)testparser.py -p $(BG)parser-lalr -s $(S)src
107-
108-
else
109-
$(info cfg: bison not available, skipping parser test...)
110-
check-grammar:
111-
112-
endif
113-
else
114-
$(info cfg: flex not available, skipping parser test...)
115-
check-grammar:
116-
117-
endif

‎branches/try/mk/main.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
3030
CFG_DISABLE_UNSTABLE_FEATURES=1
3131
endif
3232
ifeq ($(CFG_RELEASE_CHANNEL),beta)
33-
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
34-
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
33+
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
34+
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
3535
CFG_DISABLE_UNSTABLE_FEATURES=1
3636
endif
3737
ifeq ($(CFG_RELEASE_CHANNEL),nightly)

‎branches/try/mk/rt.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ else ifeq ($(OSTYPE_$(1)), apple-ios)
141141
JEMALLOC_ARGS_$(1) := --disable-tls
142142
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
143143
JEMALLOC_ARGS_$(1) := --disable-tls
144-
else ifeq ($(OSTYPE_$(1)), linux-android)
145-
JEMALLOC_ARGS_$(1) := --disable-tls
146144
endif
147145

148146
################################################################################

‎branches/try/mk/tests.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,16 @@ ifdef CHECK_IGNORED
3838
TESTARGS += --ignored
3939
endif
4040

41+
TEST_BENCH =
4142

4243
# Arguments to the cfail/rfail/rpass/bench tests
4344
ifdef CFG_VALGRIND
4445
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
46+
TEST_BENCH =
4547
endif
4648

4749
ifdef PLEASE_BENCH
48-
TESTARGS += --bench
50+
TEST_BENCH = --bench
4951
endif
5052

5153
# Arguments to the perf tests
@@ -300,7 +302,6 @@ tidy:
300302
| grep '^$(S)src/libbacktrace' -v \
301303
| grep '^$(S)src/rust-installer' -v \
302304
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
303-
$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
304305

305306

306307
endif
@@ -1010,8 +1011,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10101011
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10111012
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10121013
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1013-
$(1) \
1014-
$$(S)
1014+
$(1)
10151015
@touch $$@
10161016
else
10171017
# FIXME #11094 - The above rule doesn't work right for multiple targets

0 commit comments

Comments
 (0)