Skip to content

Commit f4fe14c

Browse files
nikomatsakisnikomatsakis
committed
---
yaml --- r: 174813 b: refs/heads/snap-stage3 c: bd621f0 h: refs/heads/master i: 174811: 5d0249f v: v3
1 parent f502b3a commit f4fe14c

File tree

555 files changed

+8684
-10866
lines changed

Some content is hidden

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

555 files changed

+8684
-10866
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: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f4df69a40a0c5cbde4ab75e84e06afe10a447012
4+
refs/heads/snap-stage3: bd621f0ccb3b6c657a056fd949ed105f77a7a01f
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/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/snap-stage3/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 The Rust Project Developers
1+
Copyright (c) 2014 The Rust Project Developers
22

33
Permission is hereby granted, free of charge, to any
44
person obtaining a copy of this software and associated

‎branches/snap-stage3/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/snap-stage3/configure

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ 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"
512513
opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
513514
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
514515
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
@@ -611,11 +612,12 @@ putvar CFG_RELEASE_CHANNEL
611612
# channel.
612613
# Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
613614
# during a Makefile reconfig.
614-
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
615+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%N`}"
615616
putvar CFG_BOOTSTRAP_KEY
616617

617618
step_msg "looking for build programs"
618619

620+
probe_need CFG_PERL perl
619621
probe_need CFG_CURLORWGET curl wget
620622
probe_need CFG_PYTHON python2.7 python2.6 python2 python
621623

@@ -1373,7 +1375,7 @@ do
13731375
done
13741376

13751377
# Munge any paths that appear in config.mk back to posix-y
1376-
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
13771379
rm -f config.tmp.bak
13781380

13791381
msg

‎branches/snap-stage3/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/snap-stage3/mk/cfg/aarch64-linux-android.mk

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

‎branches/snap-stage3/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/snap-stage3/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/snap-stage3/mk/crates.mk

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log regex graphviz core rbml alloc \
55-
unicode rustc_bitflags
55+
unicode
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
57-
rustc_trans rustc_back rustc_llvm rustc_privacy
57+
rustc_trans rustc_back rustc_llvm
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
5959
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6060
TOOLS := compiletest rustdoc rustc rustbook
@@ -64,27 +64,22 @@ DEPS_libc := core
6464
DEPS_unicode := core
6565
DEPS_alloc := core libc native:jemalloc
6666
DEPS_std := core libc rand alloc collections unicode \
67-
native:rust_builtin native:backtrace native:rustrt_native \
68-
rustc_bitflags
67+
native:rust_builtin native:backtrace native:rustrt_native
6968
DEPS_graphviz := std
7069
DEPS_syntax := std term serialize log fmt_macros arena libc
7170
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
72-
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
73-
rustc_trans rustc_privacy
74-
71+
rustc_typeck rustc_resolve log syntax serialize rustc_llvm rustc_trans
7572
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
7673
log syntax serialize rustc_llvm
7774
DEPS_rustc_typeck := rustc syntax
7875
DEPS_rustc_borrowck := rustc log graphviz syntax
7976
DEPS_rustc_resolve := rustc log syntax
80-
DEPS_rustc_privacy := rustc log syntax
8177
DEPS_rustc := syntax flate arena serialize getopts rbml \
8278
log graphviz rustc_llvm rustc_back
8379
DEPS_rustc_llvm := native:rustllvm libc std
8480
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8581
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
8682
test
87-
DEPS_rustc_bitflags := core
8883
DEPS_flate := std native:miniz
8984
DEPS_arena := std
9085
DEPS_graphviz := std
@@ -116,7 +111,6 @@ ONLY_RLIB_alloc := 1
116111
ONLY_RLIB_rand := 1
117112
ONLY_RLIB_collections := 1
118113
ONLY_RLIB_unicode := 1
119-
ONLY_RLIB_rustc_bitflags := 1
120114

121115
################################################################################
122116
# You should not need to edit below this line
@@ -128,13 +122,12 @@ DOC_CRATES := $(filter-out rustc, \
128122
$(filter-out rustc_borrowck, \
129123
$(filter-out rustc_resolve, \
130124
$(filter-out rustc_driver, \
131-
$(filter-out rustc_privacy, \
132125
$(filter-out log, \
133126
$(filter-out regex, \
134127
$(filter-out getopts, \
135-
$(filter-out syntax, $(CRATES))))))))))))
128+
$(filter-out syntax, $(CRATES)))))))))))
136129
COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
137-
rustc_typeck rustc_driver syntax rustc_privacy
130+
rustc_typeck rustc_driver syntax
138131

139132
# This macro creates some simple definitions for each crate being built, just
140133
# some munging of all of the parameters above.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ ifdef CFG_DISABLE_UNSTABLE_FEATURES
330330
CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
331331
# Turn on feature-staging
332332
export CFG_DISABLE_UNSTABLE_FEATURES
333-
# Subvert unstable feature lints to do the self-build
334-
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
335333
endif
334+
# Subvert unstable feature lints to do the self-build
336335
export CFG_BOOTSTRAP_KEY
336+
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
337337

338338
######################################################################
339339
# Per-stage targets and runner

‎branches/snap-stage3/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/snap-stage3/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

‎branches/snap-stage3/src/compiletest/common.rs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::fmt;
1313
use std::str::FromStr;
1414
use regex::Regex;
1515

16-
#[derive(Clone, PartialEq, Debug)]
16+
#[derive(Clone, PartialEq)]
1717
pub enum Mode {
1818
CompileFail,
1919
RunFail,
@@ -43,9 +43,9 @@ impl FromStr for Mode {
4343
}
4444
}
4545

46-
impl fmt::Display for Mode {
46+
impl fmt::String for Mode {
4747
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
48-
fmt::Display::fmt(match *self {
48+
fmt::String::fmt(match *self {
4949
CompileFail => "compile-fail",
5050
RunFail => "run-fail",
5151
RunPass => "run-pass",
@@ -58,6 +58,12 @@ impl fmt::Display for Mode {
5858
}
5959
}
6060

61+
impl fmt::Show for Mode {
62+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
63+
fmt::String::fmt(self, f)
64+
}
65+
}
66+
6167
#[derive(Clone)]
6268
pub struct Config {
6369
// The library paths required for running the compiler
@@ -109,6 +115,20 @@ pub struct Config {
109115
// Write out a parseable log of tests that were run
110116
pub logfile: Option<Path>,
111117

118+
// Write out a json file containing any metrics of the run
119+
pub save_metrics: Option<Path>,
120+
121+
// Write and ratchet a metrics file
122+
pub ratchet_metrics: Option<Path>,
123+
124+
// Percent change in metrics to consider noise
125+
pub ratchet_noise_percent: Option<f64>,
126+
127+
// "Shard" of the testsuite to pub run: this has the form of
128+
// two numbers (a,b), and causes only those tests with
129+
// positional order equal to a mod b to run.
130+
pub test_shard: Option<(uint,uint)>,
131+
112132
// A command line to prefix program execution with,
113133
// for running under valgrind
114134
pub runtool: Option<String>,

0 commit comments

Comments
 (0)