Skip to content

Commit 80abcb5

Browse files
ahmedcharlesahmedcharles
committed
---
yaml --- r: 174767 b: refs/heads/snap-stage3 c: d7b30f9 h: refs/heads/master i: 174765: 47f6150 174763: 0e7ead2 174759: 9d5ee6c 174751: 8636c81 v: v3
1 parent 8b6dff4 commit 80abcb5

File tree

242 files changed

+2439
-3360
lines changed

Some content is hidden

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

242 files changed

+2439
-3360
lines changed

Diff for: ‎[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5d82c0fabf9169e2517b6eb3f2695cb338d669b8
4+
refs/heads/snap-stage3: d7b30f9c0a35a56dc77cbe79d950a7888522abf7
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

Diff for: ‎branches/snap-stage3/COPYRIGHT

+1-1
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

Diff for: ‎branches/snap-stage3/README.md

+1
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`

Diff for: ‎branches/snap-stage3/configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,6 @@ opt optimize-tests 1 "build tests with optimizations"
509509
opt libcpp 1 "build with llvm with libc++ instead of libstdc++ when using clang"
510510
opt llvm-assertions 1 "build LLVM with assertions"
511511
opt debug 1 "build with extra debug fun"
512-
opt ratchet-bench 0 "ratchet benchmarks"
513512
opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
514513
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
515514
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
@@ -617,6 +616,7 @@ putvar CFG_BOOTSTRAP_KEY
617616

618617
step_msg "looking for build programs"
619618

619+
probe_need CFG_PERL perl
620620
probe_need CFG_CURLORWGET curl wget
621621
probe_need CFG_PYTHON python2.7 python2.6 python2 python
622622

@@ -1374,7 +1374,7 @@ do
13741374
done
13751375

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

13801380
msg

Diff for: ‎branches/snap-stage3/man/rustdoc.1

-30
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

Diff for: ‎branches/snap-stage3/mk/cfg/i686-pc-windows-gnu.mk

+5-5
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

Diff for: ‎branches/snap-stage3/mk/cfg/x86_64-pc-windows-gnu.mk

+5-5
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

Diff for: ‎branches/snap-stage3/mk/tests.mk

+4-4
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)