Skip to content

Commit d753d09

Browse files
borsbors
committed
---
yaml --- r: 212908 b: refs/heads/master c: 906ad72 h: refs/heads/master v: v3
1 parent 8d084a5 commit d753d09

File tree

447 files changed

+3794
-14529
lines changed

Some content is hidden

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

447 files changed

+3794
-14529
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3e7ab1b5cbda47d06627482616cb009e039a4815
2+
refs/heads/master: 906ad724620e1ff93082b364a38761940a7abdcf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
55
refs/heads/try: 1864973ae17213c5a58c4dd3f9af6d1b6c7d2e05

‎trunk/.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ 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+
1924
notifications:
2025
email: false
2126

‎trunk/RELEASES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
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+
119
Version 1.0.0 (May 2015)
220
========================
321

‎trunk/configure

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

523523
CFG_SRC_DIR="$(abs_path $(dirname $0))/"
524+
CFG_SRC_DIR_RELATIVE="$(dirname $0)/"
524525
CFG_BUILD_DIR="$(pwd)/"
525526
CFG_SELF="$0"
526527
CFG_CONFIGURE_ARGS="$@"
@@ -1558,6 +1559,7 @@ done
15581559
step_msg "writing configuration"
15591560

15601561
putvar CFG_SRC_DIR
1562+
putvar CFG_SRC_DIR_RELATIVE
15611563
putvar CFG_BUILD_DIR
15621564
putvar CFG_OSTYPE
15631565
putvar CFG_CPUTYPE

‎trunk/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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
9+
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
1212
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD

‎trunk/mk/cfg/x86_64-unknown-linux-musl.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ 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
67
CFG_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).so
78
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).a
89
CFG_LIB_GLOB_x86_64-unknown-linux-musl=lib$(1)-*.so

‎trunk/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) := $$(S)src/lib$(1)/lib.rs
137+
CRATEFILE_$(1) := $$(SREL)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))))

‎trunk/mk/main.mk

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

324324
export CFG_SRC_DIR
325+
export CFG_SRC_DIR_RELATIVE
325326
export CFG_BUILD_DIR
326327
ifdef CFG_VER_DATE
327328
export CFG_VER_DATE

‎trunk/mk/prepare.mk

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,34 @@ 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.
3236
define PREPARE_DIR
33-
@$(Q)$(call E, prepare: $(1))
37+
38+
@$(call E, prepare: $(1))
3439
$(Q)$(PREPARE_DIR_CMD) $(1)
40+
3541
endef
3642

3743
# Copy an executable
3844
# $(1) is the filename/libname-glob
3945
#
40-
# Gee, what's up with that $(nop)? See comment below.
46+
# See above for an explanation on the surrounding blank lines
4147
define PREPARE_BIN
42-
$(nop)
48+
4349
@$(call E, prepare: $(PREPARE_DEST_BIN_DIR)/$(1))
4450
$(Q)$(PREPARE_BIN_CMD) $(PREPARE_SOURCE_BIN_DIR)/$(1) $(PREPARE_DEST_BIN_DIR)/$(1)
51+
4552
endef
4653

4754
# Copy a dylib or rlib
4855
# $(1) is the filename/libname-glob
4956
#
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?
57+
# See above for an explanation on the surrounding blank lines
5458
define PREPARE_LIB
55-
$(nop)
59+
5660
@$(call E, prepare: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
5761
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
5862
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))), \
@@ -63,14 +67,19 @@ define PREPARE_LIB
6367
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
6468
echo $$MATCHES ; \
6569
fi
66-
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
70+
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)` $(PREPARE_WORKING_DEST_LIB_DIR)/
71+
6772
endef
6873

6974
# Copy a man page
7075
# $(1) - source dir
76+
#
77+
# See above for an explanation on the surrounding blank lines
7178
define PREPARE_MAN
79+
7280
@$(call E, prepare: $(PREPARE_DEST_MAN_DIR)/$(1))
7381
$(Q)$(PREPARE_MAN_CMD) $(PREPARE_SOURCE_MAN_DIR)/$(1) $(PREPARE_DEST_MAN_DIR)/$(1)
82+
7483
endef
7584

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

‎trunk/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-
$(S)configure $(CFG_CONFIGURE_ARGS)
37+
$(SREL)configure $(CFG_CONFIGURE_ARGS)

‎trunk/mk/util.mk

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

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

‎trunk/src/compiletest/common.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ 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-
130127
// Target system to be tested
131128
pub target: String,
132129

‎trunk/src/compiletest/compiletest.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ 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"),
8382
optopt("", "target", "the target to build for", "TARGET"),
8483
optopt("", "host", "the host to build for", "HOST"),
8584
optopt("", "gdb-version", "the version of GDB used", "VERSION STRING"),
@@ -146,7 +145,6 @@ pub fn parse_config(args: Vec<String> ) -> Config {
146145
runtool: matches.opt_str("runtool"),
147146
host_rustcflags: matches.opt_str("host-rustcflags"),
148147
target_rustcflags: matches.opt_str("target-rustcflags"),
149-
jit: matches.opt_present("jit"),
150148
target: opt_str2(matches.opt_str("target")),
151149
host: opt_str2(matches.opt_str("host")),
152150
gdb_version: extract_gdb_version(matches.opt_str("gdb-version")),
@@ -186,7 +184,6 @@ pub fn log_config(config: &Config) {
186184
opt_str(&config.host_rustcflags)));
187185
logv(c, format!("target-rustcflags: {}",
188186
opt_str(&config.target_rustcflags)));
189-
logv(c, format!("jit: {}", config.jit));
190187
logv(c, format!("target: {}", config.target));
191188
logv(c, format!("host: {}", config.host));
192189
logv(c, format!("android-cross-path: {:?}",

‎trunk/src/compiletest/runtest.rs

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,13 @@ 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 = if !config.jit {
102-
let proc_res = compile_test(config, props, testfile);
101+
let proc_res = compile_test(config, props, testfile);
103102

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

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

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

135131
fn run_rpass_test(config: &Config, props: &TestProps, testfile: &Path) {
136-
if !config.jit {
137-
let mut proc_res = compile_test(config, props, testfile);
138-
139-
if !proc_res.status.success() {
140-
fatal_proc_rec("compilation failed!", &proc_res);
141-
}
132+
let proc_res = compile_test(config, props, testfile);
142133

143-
proc_res = exec_compiled_test(config, props, testfile);
134+
if !proc_res.status.success() {
135+
fatal_proc_rec("compilation failed!", &proc_res);
136+
}
144137

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);
138+
let proc_res = exec_compiled_test(config, props, testfile);
150139

151-
if !proc_res.status.success() {
152-
fatal_proc_rec("jit failed!", &proc_res);
153-
}
140+
if !proc_res.status.success() {
141+
fatal_proc_rec("test run failed!", &proc_res);
154142
}
155143
}
156144

@@ -285,8 +273,8 @@ fn run_pretty_test(config: &Config, props: &TestProps, testfile: &Path) {
285273
format!("--target={}", config.target),
286274
"-L".to_string(),
287275
aux_dir.to_str().unwrap().to_string());
288-
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
289-
args.extend(split_maybe_args(&props.compile_flags).into_iter());
276+
args.extend(split_maybe_args(&config.target_rustcflags));
277+
args.extend(split_maybe_args(&props.compile_flags));
290278
return ProcArgs {
291279
prog: config.rustc_path.to_str().unwrap().to_string(),
292280
args: args,
@@ -333,8 +321,8 @@ actual:\n\
333321
config.build_base.to_str().unwrap().to_string(),
334322
"-L".to_string(),
335323
aux_dir.to_str().unwrap().to_string());
336-
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
337-
args.extend(split_maybe_args(&props.compile_flags).into_iter());
324+
args.extend(split_maybe_args(&config.target_rustcflags));
325+
args.extend(split_maybe_args(&props.compile_flags));
338326
// FIXME (#9639): This needs to handle non-utf8 paths
339327
return ProcArgs {
340328
prog: config.rustc_path.to_str().unwrap().to_string(),
@@ -380,7 +368,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
380368
script_str.push_str(&format!("set solib-search-path \
381369
./{}/stage2/lib/rustlib/{}/lib/\n",
382370
config.host, config.target));
383-
for line in breakpoint_lines.iter() {
371+
for line in &breakpoint_lines {
384372
script_str.push_str(&format!("break {:?}:{}\n",
385373
testfile.file_name().unwrap()
386374
.to_string_lossy(),
@@ -1141,10 +1129,6 @@ fn compile_test(config: &Config, props: &TestProps,
11411129
compile_test_(config, props, testfile, &[])
11421130
}
11431131

1144-
fn jit_test(config: &Config, props: &TestProps, testfile: &Path) -> ProcRes {
1145-
compile_test_(config, props, testfile, &["--jit".to_string()])
1146-
}
1147-
11481132
fn compile_test_(config: &Config, props: &TestProps,
11491133
testfile: &Path, extra_args: &[String]) -> ProcRes {
11501134
let aux_dir = aux_output_dir_name(config, testfile);
@@ -1171,7 +1155,7 @@ fn document(config: &Config, props: &TestProps,
11711155
out_dir.to_str().unwrap().to_string(),
11721156
testfile.to_str().unwrap().to_string()];
11731157
args.extend(extra_args.iter().cloned());
1174-
args.extend(split_maybe_args(&props.compile_flags).into_iter());
1158+
args.extend(split_maybe_args(&props.compile_flags));
11751159
let args = ProcArgs {
11761160
prog: config.rustdoc_path.to_str().unwrap().to_string(),
11771161
args: args,
@@ -1236,7 +1220,7 @@ fn compose_and_run_compiler(config: &Config, props: &TestProps,
12361220
vec!("--crate-type=dylib".to_string())
12371221
}
12381222
};
1239-
crate_type.extend(extra_link_args.clone().into_iter());
1223+
crate_type.extend(extra_link_args.clone());
12401224
let aux_args =
12411225
make_compile_args(config,
12421226
&aux_props,
@@ -1334,11 +1318,11 @@ fn make_compile_args<F>(config: &Config,
13341318
};
13351319
args.push(path.to_str().unwrap().to_string());
13361320
if props.force_host {
1337-
args.extend(split_maybe_args(&config.host_rustcflags).into_iter());
1321+
args.extend(split_maybe_args(&config.host_rustcflags));
13381322
} else {
1339-
args.extend(split_maybe_args(&config.target_rustcflags).into_iter());
1323+
args.extend(split_maybe_args(&config.target_rustcflags));
13401324
}
1341-
args.extend(split_maybe_args(&props.compile_flags).into_iter());
1325+
args.extend(split_maybe_args(&props.compile_flags));
13421326
return ProcArgs {
13431327
prog: config.rustc_path.to_str().unwrap().to_string(),
13441328
args: args,
@@ -1373,7 +1357,7 @@ fn make_run_args(config: &Config, props: &TestProps, testfile: &Path)
13731357
args.push(exe_file.to_str().unwrap().to_string());
13741358

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

13781362
let prog = args.remove(0);
13791363
return ProcArgs {
@@ -1683,7 +1667,7 @@ fn compile_test_and_save_ir(config: &Config, props: &TestProps,
16831667
aux_dir.to_str().unwrap().to_string());
16841668
let llvm_args = vec!("--emit=llvm-ir".to_string(),
16851669
"--crate-type=lib".to_string());
1686-
link_args.extend(llvm_args.into_iter());
1670+
link_args.extend(llvm_args);
16871671
let args = make_compile_args(config,
16881672
props,
16891673
link_args,

‎trunk/src/doc/complement-lang-faq.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Yes. For example (incomplete):
3737
* [wit.ai](https://github.com/wit-ai/witd)
3838
* [Codius](https://codius.org/blog/codius-rust/)
3939
* [MaidSafe](http://maidsafe.net/)
40+
* [Terminal.com](https://terminal.com)
4041

4142
## Does it run on Windows?
4243

‎trunk/src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ extern fn new_i32() -> i32 { 0 }
11111111
extern "stdcall" fn new_i32_stdcall() -> i32 { 0 }
11121112
```
11131113

1114-
Unlike normal functions, extern fns have an `extern "ABI" fn()`. This is the
1114+
Unlike normal functions, extern fns have type `extern "ABI" fn()`. This is the
11151115
same type as the functions declared in an extern block.
11161116

11171117
```

‎trunk/src/doc/trpl/associated-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ trait Graph {
4343
Now, our clients can be abstract over a given `Graph`:
4444

4545
```rust,ignore
46-
fn distance<G: Graph>(graph: &G, start: &G::N, end: &G::N) -> usize { ... }
46+
fn distance<G: Graph>(graph: &G, start: &G::N, end: &G::N) -> u32 { ... }
4747
```
4848

4949
No need to deal with the `E`dge type here!

‎trunk/src/doc/trpl/hello-cargo.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ To start a new project with Cargo, use `cargo new`:
145145
$ cargo new hello_world --bin
146146
```
147147

148-
We’re passing `--bin` because we're making a binary program: if we were making
149-
a library, we'd leave it off.
148+
We’re passing `--bin` because our goal is to get straight to making an executable application, as opposed to a library. Executables are often called ‘binaries.’ (as in `/usr/bin`, if you’re on a Unix system)
150149

151150
Let's check out what Cargo has generated for us:
152151

0 commit comments

Comments
 (0)