Skip to content

Commit c01322e

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 227543 b: refs/heads/try c: f9d4149 h: refs/heads/master i: 227541: 9961974 227539: df95e06 227535: 1c86a93 v: v3
1 parent 5c025d2 commit c01322e

File tree

541 files changed

+16212
-7291
lines changed

Some content is hidden

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

541 files changed

+16212
-7291
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: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 0250ff9a5f1347f3177516e178fd8382d48169c7
4+
refs/heads/try: f9d4149c29e8b989fa3624993be379f380e48dcf
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ before_script:
1616
script:
1717
- make tidy
1818

19-
# Real testing happens on http://buildbot.rust-lang.org/
20-
#
21-
# See https://github.com/rust-lang/rust-buildbot
22-
# CONTRIBUTING.md#pull-requests
23-
2419
notifications:
2520
email: false
2621

‎branches/try/RELEASES.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
Version 1.1.0 (July 2015)
2-
========================
3-
4-
* NNNN changes, numerous bugfixes
5-
6-
Libraries
7-
---------
8-
9-
* The [`std::fs` module has been expanded][fs-expand] to expand the set of
10-
functionality exposed:
11-
* `DirEntry` now supports optimizations like `file_type` and `metadata` which
12-
don't incur a syscall on some platforms.
13-
* A `symlink_metadata` function has been added.
14-
* The `fs::Metadata` structure now lowers to its OS counterpart, providing
15-
access to all underlying information.
16-
17-
[fs-expand]: https://github.com/rust-lang/rust/pull/25844
18-
191
Version 1.0.0 (May 2015)
202
========================
213

‎branches/try/configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ fi
521521
DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"
522522

523523
CFG_SRC_DIR="$(abs_path $(dirname $0))/"
524-
CFG_SRC_DIR_RELATIVE="$(dirname $0)/"
525524
CFG_BUILD_DIR="$(pwd)/"
526525
CFG_SELF="$0"
527526
CFG_CONFIGURE_ARGS="$@"
@@ -1559,7 +1558,6 @@ done
15591558
step_msg "writing configuration"
15601559

15611560
putvar CFG_SRC_DIR
1562-
putvar CFG_SRC_DIR_RELATIVE
15631561
putvar CFG_BUILD_DIR
15641562
putvar CFG_OSTYPE
15651563
putvar CFG_CPUTYPE

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
66
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
9-
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
9+
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
13-
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc :=
13+
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc :=
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_x86_64-pc-windows-msvc :=

‎branches/try/mk/cfg/x86_64-unknown-linux-musl.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CC_x86_64-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc
33
CXX_x86_64-unknown-linux-musl=notaprogram
44
CPP_x86_64-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc -E
55
AR_x86_64-unknown-linux-musl=$(AR)
6-
CFG_INSTALL_ONLY_RLIB_x86_64-unknown-linux-musl = 1
76
CFG_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).so
87
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).a
98
CFG_LIB_GLOB_x86_64-unknown-linux-musl=lib$(1)-*.so

‎branches/try/mk/crates.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ DOC_CRATES := std alloc collections core libc rustc_unicode
134134
#
135135
# $(1) is the crate to generate variables for
136136
define RUST_CRATE
137-
CRATEFILE_$(1) := $$(SREL)src/lib$(1)/lib.rs
137+
CRATEFILE_$(1) := $$(S)src/lib$(1)/lib.rs
138138
RSINPUTS_$(1) := $$(call rwildcard,$(S)src/lib$(1)/,*.rs)
139139
RUST_DEPS_$(1) := $$(filter-out native:%,$$(DEPS_$(1)))
140140
NATIVE_DEPS_$(1) := $$(patsubst native:%,%,$$(filter native:%,$$(DEPS_$(1))))

‎branches/try/mk/docs.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ DOC_TARGETS += doc/not_found.html
169169
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
170170
@$(call E, rustdoc: $@)
171171
$(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \
172-
--markdown-no-toc \
173172
--markdown-css http://doc.rust-lang.org/rust.css $<
174173

175174
define DEF_DOC

‎branches/try/mk/main.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ $(foreach host,$(CFG_HOST), \
322322
# exported
323323

324324
export CFG_SRC_DIR
325-
export CFG_SRC_DIR_RELATIVE
326325
export CFG_BUILD_DIR
327326
ifdef CFG_VER_DATE
328327
export CFG_VER_DATE

‎branches/try/mk/prepare.mk

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,30 @@ DEFAULT_PREPARE_MAN_CMD = install -m644
2929

3030
# Create a directory
3131
# $(1) is the directory
32-
#
33-
# XXX: These defines are called to generate make steps.
34-
# Adding blank lines means two steps from different defines will not end up on
35-
# the same line.
3632
define PREPARE_DIR
37-
38-
@$(call E, prepare: $(1))
33+
@$(Q)$(call E, prepare: $(1))
3934
$(Q)$(PREPARE_DIR_CMD) $(1)
40-
4135
endef
4236

4337
# Copy an executable
4438
# $(1) is the filename/libname-glob
4539
#
46-
# See above for an explanation on the surrounding blank lines
40+
# Gee, what's up with that $(nop)? See comment below.
4741
define PREPARE_BIN
48-
42+
$(nop)
4943
@$(call E, prepare: $(PREPARE_DEST_BIN_DIR)/$(1))
5044
$(Q)$(PREPARE_BIN_CMD) $(PREPARE_SOURCE_BIN_DIR)/$(1) $(PREPARE_DEST_BIN_DIR)/$(1)
51-
5245
endef
5346

5447
# Copy a dylib or rlib
5548
# $(1) is the filename/libname-glob
5649
#
57-
# See above for an explanation on the surrounding blank lines
50+
# XXX: Don't remove the $(nop) command below!
51+
# Yeah, that's right, it's voodoo. Something in the way this macro is being expanded
52+
# causes it to parse incorrectly. Throwing in that empty command seems to fix the
53+
# problem. I'm sorry, just don't remove the $(nop), alright?
5854
define PREPARE_LIB
59-
55+
$(nop)
6056
@$(call E, prepare: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
6157
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
6258
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))), \
@@ -67,19 +63,14 @@ define PREPARE_LIB
6763
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
6864
echo $$MATCHES ; \
6965
fi
70-
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)` $(PREPARE_WORKING_DEST_LIB_DIR)/
71-
66+
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
7267
endef
7368

7469
# Copy a man page
7570
# $(1) - source dir
76-
#
77-
# See above for an explanation on the surrounding blank lines
7871
define PREPARE_MAN
79-
8072
@$(call E, prepare: $(PREPARE_DEST_MAN_DIR)/$(1))
8173
$(Q)$(PREPARE_MAN_CMD) $(PREPARE_SOURCE_MAN_DIR)/$(1) $(PREPARE_DEST_MAN_DIR)/$(1)
82-
8374
endef
8475

8576
PREPARE_TOOLS = $(filter-out compiletest rustbook error-index-generator, $(TOOLS))

‎branches/try/mk/reconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Makefile config.mk: config.stamp
3434

3535
config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
3636
@$(call E, cfg: reconfiguring)
37-
$(SREL)configure $(CFG_CONFIGURE_ARGS)
37+
$(S)configure $(CFG_CONFIGURE_ARGS)

‎branches/try/mk/util.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ print-%:
2020
@echo $*=$($*)
2121

2222
S := $(CFG_SRC_DIR)
23-
SREL := $(CFG_SRC_DIR_RELATIVE)

‎branches/try/src/compiletest/common.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ pub struct Config {
124124
// Flags to pass to the compiler when building for the target
125125
pub target_rustcflags: Option<String>,
126126

127+
// Run tests using the JIT
128+
pub jit: bool,
129+
127130
// Target system to be tested
128131
pub target: String,
129132

‎branches/try/src/compiletest/compiletest.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
7979
optopt("", "target-rustcflags", "flags to pass to rustc for target", "FLAGS"),
8080
optflag("", "verbose", "run tests verbosely, showing all output"),
8181
optopt("", "logfile", "file to log test execution to", "FILE"),
82+
optflag("", "jit", "run tests under the JIT"),
8283
optopt("", "target", "the target to build for", "TARGET"),
8384
optopt("", "host", "the host to build for", "HOST"),
8485
optopt("", "gdb-version", "the version of GDB used", "VERSION STRING"),
@@ -145,6 +146,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
145146
runtool: matches.opt_str("runtool"),
146147
host_rustcflags: matches.opt_str("host-rustcflags"),
147148
target_rustcflags: matches.opt_str("target-rustcflags"),
149+
jit: matches.opt_present("jit"),
148150
target: opt_str2(matches.opt_str("target")),
149151
host: opt_str2(matches.opt_str("host")),
150152
gdb_version: extract_gdb_version(matches.opt_str("gdb-version")),
@@ -184,6 +186,7 @@ pub fn log_config(config: &Config) {
184186
opt_str(&config.host_rustcflags)));
185187
logv(c, format!("target-rustcflags: {}",
186188
opt_str(&config.target_rustcflags)));
189+
logv(c, format!("jit: {}", config.jit));
187190
logv(c, format!("target: {}", config.target));
188191
logv(c, format!("host: {}", config.host));
189192
logv(c, format!("android-cross-path: {:?}",

‎branches/try/src/compiletest/runtest.rs

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,17 @@ fn run_cfail_test(config: &Config, props: &TestProps, testfile: &Path) {
9898
}
9999

100100
fn run_rfail_test(config: &Config, props: &TestProps, testfile: &Path) {
101-
let proc_res = compile_test(config, props, testfile);
101+
let proc_res = if !config.jit {
102+
let proc_res = compile_test(config, props, testfile);
102103

103-
if !proc_res.status.success() {
104-
fatal_proc_rec("compilation failed!", &proc_res);
105-
}
104+
if !proc_res.status.success() {
105+
fatal_proc_rec("compilation failed!", &proc_res);
106+
}
106107

107-
let proc_res = exec_compiled_test(config, props, testfile);
108+
exec_compiled_test(config, props, testfile)
109+
} else {
110+
jit_test(config, props, testfile)
111+
};
108112

109113
// The value our Makefile configures valgrind to return on failure
110114
const VALGRIND_ERR: i32 = 100;
@@ -129,16 +133,24 @@ fn check_correct_failure_status(proc_res: &ProcRes) {
129133
}
130134

131135
fn run_rpass_test(config: &Config, props: &TestProps, testfile: &Path) {
132-
let proc_res = compile_test(config, props, testfile);
136+
if !config.jit {
137+
let mut proc_res = compile_test(config, props, testfile);
133138

134-
if !proc_res.status.success() {
135-
fatal_proc_rec("compilation failed!", &proc_res);
136-
}
139+
if !proc_res.status.success() {
140+
fatal_proc_rec("compilation failed!", &proc_res);
141+
}
137142

138-
let proc_res = exec_compiled_test(config, props, testfile);
143+
proc_res = exec_compiled_test(config, props, testfile);
139144

140-
if !proc_res.status.success() {
141-
fatal_proc_rec("test run failed!", &proc_res);
145+
if !proc_res.status.success() {
146+
fatal_proc_rec("test run failed!", &proc_res);
147+
}
148+
} else {
149+
let proc_res = jit_test(config, props, testfile);
150+
151+
if !proc_res.status.success() {
152+
fatal_proc_rec("jit failed!", &proc_res);
153+
}
142154
}
143155
}
144156

@@ -273,8 +285,8 @@ fn run_pretty_test(config: &Config, props: &TestProps, testfile: &Path) {
273285
format!("--target={}", config.target),
274286
"-L".to_string(),
275287
aux_dir.to_str().unwrap().to_string());
276-
args.extend(split_maybe_args(&config.target_rustcflags));
277-
args.extend(split_maybe_args(&props.compile_flags));
288+
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
289+
args.extend(split_maybe_args(&props.compile_flags).into_iter());
278290
return ProcArgs {
279291
prog: config.rustc_path.to_str().unwrap().to_string(),
280292
args: args,
@@ -321,8 +333,8 @@ actual:\n\
321333
config.build_base.to_str().unwrap().to_string(),
322334
"-L".to_string(),
323335
aux_dir.to_str().unwrap().to_string());
324-
args.extend(split_maybe_args(&config.target_rustcflags));
325-
args.extend(split_maybe_args(&props.compile_flags));
336+
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
337+
args.extend(split_maybe_args(&props.compile_flags).into_iter());
326338
// FIXME (#9639): This needs to handle non-utf8 paths
327339
return ProcArgs {
328340
prog: config.rustc_path.to_str().unwrap().to_string(),
@@ -368,7 +380,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
368380
script_str.push_str(&format!("set solib-search-path \
369381
./{}/stage2/lib/rustlib/{}/lib/\n",
370382
config.host, config.target));
371-
for line in &breakpoint_lines {
383+
for line in breakpoint_lines.iter() {
372384
script_str.push_str(&format!("break {:?}:{}\n",
373385
testfile.file_name().unwrap()
374386
.to_string_lossy(),
@@ -1129,6 +1141,10 @@ fn compile_test(config: &Config, props: &TestProps,
11291141
compile_test_(config, props, testfile, &[])
11301142
}
11311143

1144+
fn jit_test(config: &Config, props: &TestProps, testfile: &Path) -> ProcRes {
1145+
compile_test_(config, props, testfile, &["--jit".to_string()])
1146+
}
1147+
11321148
fn compile_test_(config: &Config, props: &TestProps,
11331149
testfile: &Path, extra_args: &[String]) -> ProcRes {
11341150
let aux_dir = aux_output_dir_name(config, testfile);
@@ -1155,7 +1171,7 @@ fn document(config: &Config, props: &TestProps,
11551171
out_dir.to_str().unwrap().to_string(),
11561172
testfile.to_str().unwrap().to_string()];
11571173
args.extend(extra_args.iter().cloned());
1158-
args.extend(split_maybe_args(&props.compile_flags));
1174+
args.extend(split_maybe_args(&props.compile_flags).into_iter());
11591175
let args = ProcArgs {
11601176
prog: config.rustdoc_path.to_str().unwrap().to_string(),
11611177
args: args,
@@ -1220,7 +1236,7 @@ fn compose_and_run_compiler(config: &Config, props: &TestProps,
12201236
vec!("--crate-type=dylib".to_string())
12211237
}
12221238
};
1223-
crate_type.extend(extra_link_args.clone());
1239+
crate_type.extend(extra_link_args.clone().into_iter());
12241240
let aux_args =
12251241
make_compile_args(config,
12261242
&aux_props,
@@ -1318,11 +1334,11 @@ fn make_compile_args<F>(config: &Config,
13181334
};
13191335
args.push(path.to_str().unwrap().to_string());
13201336
if props.force_host {
1321-
args.extend(split_maybe_args(&config.host_rustcflags));
1337+
args.extend(split_maybe_args(&config.host_rustcflags).into_iter());
13221338
} else {
1323-
args.extend(split_maybe_args(&config.target_rustcflags));
1339+
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
13241340
}
1325-
args.extend(split_maybe_args(&props.compile_flags));
1341+
args.extend(split_maybe_args(&props.compile_flags).into_iter());
13261342
return ProcArgs {
13271343
prog: config.rustc_path.to_str().unwrap().to_string(),
13281344
args: args,
@@ -1357,7 +1373,7 @@ fn make_run_args(config: &Config, props: &TestProps, testfile: &Path)
13571373
args.push(exe_file.to_str().unwrap().to_string());
13581374

13591375
// Add the arguments in the run_flags directive
1360-
args.extend(split_maybe_args(&props.run_flags));
1376+
args.extend(split_maybe_args(&props.run_flags).into_iter());
13611377

13621378
let prog = args.remove(0);
13631379
return ProcArgs {
@@ -1667,7 +1683,7 @@ fn compile_test_and_save_ir(config: &Config, props: &TestProps,
16671683
aux_dir.to_str().unwrap().to_string());
16681684
let llvm_args = vec!("--emit=llvm-ir".to_string(),
16691685
"--crate-type=lib".to_string());
1670-
link_args.extend(llvm_args);
1686+
link_args.extend(llvm_args.into_iter());
16711687
let args = make_compile_args(config,
16721688
props,
16731689
link_args,

‎branches/try/src/doc/complement-lang-faq.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ You may also be interested in browsing [trending Rust repositories][github-rust]
3030

3131
## Is anyone using Rust in production?
3232

33-
Yes. For example (incomplete):
33+
Currently, Rust is still pre-1.0, and so we don't recommend that you use Rust
34+
in production unless you know exactly what you're getting into.
35+
36+
That said, there are two production deployments of Rust that we're aware of:
3437

3538
* [OpenDNS](http://labs.opendns.com/2013/10/04/zeromq-helping-us-block-malicious-domains/)
3639
* [Skylight](http://skylight.io)
37-
* [wit.ai](https://github.com/wit-ai/witd)
38-
* [Codius](https://codius.org/blog/codius-rust/)
39-
* [MaidSafe](http://maidsafe.net/)
40-
* [Terminal.com](https://terminal.com)
40+
41+
Let the fact that this is an easily countable number be a warning.
4142

4243
## Does it run on Windows?
4344

‎branches/try/src/doc/grammar.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,7 @@ type_path_tail : '<' type_expr [ ',' type_expr ] + '>'
281281
## Macros
282282

283283
```antlr
284-
expr_macro_rules : "macro_rules" '!' ident '(' macro_rule * ')' ';'
285-
| "macro_rules" '!' ident '{' macro_rule * '}' ;
284+
expr_macro_rules : "macro_rules" '!' ident '(' macro_rule * ')' ;
286285
macro_rule : '(' matcher * ')' "=>" '(' transcriber * ')' ';' ;
287286
matcher : '(' matcher * ')' | '[' matcher * ']'
288287
| '{' matcher * '}' | '$' ident ':' ident

0 commit comments

Comments
 (0)