Skip to content

Commit c9a6a03

Browse files
mbrubeckmbrubeck
committed
---
yaml --- r: 277359 b: refs/heads/try c: 4d7b930 h: refs/heads/master i: 277357: 08283aa 277355: b0e96cd 277351: f3685af 277343: b6cdbdc
1 parent 320d60f commit c9a6a03

File tree

305 files changed

+7352
-8735
lines changed

Some content is hidden

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

305 files changed

+7352
-8735
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: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 90318b8c225cde275cf2059330dc096f77301bce
4+
refs/heads/try: 4d7b930d886812a0b91227879d831ead98f1c5d3
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/configure

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
609609
opt rustbuild 0 "use the rust and cargo based build system"
610610
opt orbit 0 "get MIR where it belongs - everywhere; most importantly, in orbit"
611611
opt codegen-tests 1 "run the src/test/codegen tests"
612-
opt option-checking 1 "complain about unrecognized options in this configure script"
613612

614613
# Optimization and debugging options. These may be overridden by the release channel, etc.
615614
opt_nosave optimize 1 "build optimized rust code"
@@ -675,11 +674,8 @@ then
675674
fi
676675

677676
# Validate Options
678-
if [ -z "$CFG_DISABLE_OPTION_CHECKING" ]
679-
then
680-
step_msg "validating $CFG_SELF args"
681-
validate_opt
682-
fi
677+
step_msg "validating $CFG_SELF args"
678+
validate_opt
683679

684680
# Validate the release channel, and configure options
685681
case "$CFG_RELEASE_CHANNEL" in
@@ -823,19 +819,6 @@ then
823819
fi
824820
fi
825821

826-
# LLDB tests on OSX require /usr/bin/python, not something like Homebrew's
827-
# /usr/local/bin/python. We're loading a compiled module for LLDB tests which is
828-
# only compatible with the system.
829-
case $CFG_BUILD in
830-
*-apple-darwin)
831-
CFG_LLDB_PYTHON=/usr/bin/python
832-
;;
833-
*)
834-
CFG_LLDB_PYTHON=$CFG_PYTHON
835-
;;
836-
esac
837-
putvar CFG_LLDB_PYTHON
838-
839822
step_msg "looking for target specific programs"
840823

841824
probe CFG_ADB adb

‎branches/try/mk/crates.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize \
9797
rustc_back graphviz
9898

9999
DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml \
100-
log graphviz rustc_llvm rustc_back rustc_data_structures\
100+
log graphviz rustc_back rustc_data_structures\
101101
rustc_const_math
102102
DEPS_rustc_back := std syntax flate log libc
103103
DEPS_rustc_borrowck := rustc rustc_mir log graphviz syntax
@@ -128,7 +128,7 @@ DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
128128
test rustc_lint rustc_const_eval
129129

130130

131-
TOOL_DEPS_compiletest := test getopts log serialize
131+
TOOL_DEPS_compiletest := test getopts log
132132
TOOL_DEPS_rustdoc := rustdoc
133133
TOOL_DEPS_rustc := rustc_driver
134134
TOOL_DEPS_rustbook := std rustdoc

‎branches/try/mk/rustllvm.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ $$(RT_OUTPUT_DIR_$(1))/$$(call CFG_STATIC_LIB_NAME_$(1),rustllvm): \
4343
@$$(call E, link: $$@)
4444
$$(Q)$$(call CFG_CREATE_ARCHIVE_$(1),$$@) $$^
4545

46-
RUSTLLVM_COMPONENTS_$(1) = $$(shell echo $$(LLVM_ALL_COMPONENTS_$(1)) |\
47-
tr 'a-z-' 'A-Z_'| sed -e 's/^ //;s/\([^ ]*\)/\-DLLVM_COMPONENT_\1/g')
48-
4946
# On MSVC we need to double-escape arguments that llvm-config printed which
5047
# start with a '/'. The shell we're running in will auto-translate the argument
5148
# `/foo` to `C:/msys64/foo` but we really want it to be passed through as `/foo`
@@ -54,7 +51,6 @@ $(1)/rustllvm/%.o: $(S)src/rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
5451
@$$(call E, compile: $$@)
5552
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@,) \
5653
$$(subst /,//,$$(LLVM_CXXFLAGS_$(1))) \
57-
$$(RUSTLLVM_COMPONENTS_$(1)) \
5854
$$(EXTRA_RUSTLLVM_CXXFLAGS_$(1)) \
5955
$$(RUSTLLVM_INCS_$(1)) \
6056
$$<

‎branches/try/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
619619
--stage-id stage$(1)-$(2) \
620620
--target $(2) \
621621
--host $(3) \
622-
--docck-python $$(CFG_PYTHON) \
623-
--lldb-python $$(CFG_LLDB_PYTHON) \
622+
--python $$(CFG_PYTHON) \
624623
--gdb-version="$(CFG_GDB_VERSION)" \
625624
--lldb-version="$(CFG_LLDB_VERSION)" \
626625
--android-cross-path=$(CFG_ANDROID_CROSS_PATH) \

‎branches/try/src/bootstrap/build/check.rs

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// except according to those terms.
1010

1111
use std::fs;
12-
use std::path::{PathBuf, Path};
13-
use std::process::Command;
12+
use std::path::PathBuf;
1413

1514
use build::{Build, Compiler};
1615

@@ -82,19 +81,8 @@ pub fn compiletest(build: &Build,
8281

8382
// FIXME: needs android support
8483
cmd.arg("--android-cross-path").arg("");
85-
8684
// FIXME: CFG_PYTHON should probably be detected more robustly elsewhere
87-
let python_default = "python";
88-
cmd.arg("--docck-python").arg(python_default);
89-
90-
if build.config.build.ends_with("apple-darwin") {
91-
// Force /usr/bin/python on OSX for LLDB tests because we're loading the
92-
// LLDB plugin's compiled module which only works with the system python
93-
// (namely not Homebrew-installed python)
94-
cmd.arg("--lldb-python").arg("/usr/bin/python");
95-
} else {
96-
cmd.arg("--lldb-python").arg(python_default);
97-
}
85+
cmd.arg("--python").arg("python");
9886

9987
if let Some(ref vers) = build.gdb_version {
10088
cmd.arg("--gdb-version").arg(vers);
@@ -114,42 +102,3 @@ pub fn compiletest(build: &Build,
114102

115103
build.run(&mut cmd);
116104
}
117-
118-
pub fn docs(build: &Build, compiler: &Compiler) {
119-
let mut stack = vec![build.src.join("src/doc")];
120-
121-
while let Some(p) = stack.pop() {
122-
if p.is_dir() {
123-
stack.extend(t!(p.read_dir()).map(|p| t!(p).path()));
124-
continue
125-
}
126-
127-
if p.extension().and_then(|s| s.to_str()) != Some("md") {
128-
continue
129-
}
130-
131-
println!("doc tests for: {}", p.display());
132-
markdown_test(build, compiler, &p);
133-
}
134-
}
135-
136-
pub fn error_index(build: &Build, compiler: &Compiler) {
137-
println!("Testing error-index stage{}", compiler.stage);
138-
139-
let output = testdir(build, compiler.host).join("error-index.md");
140-
build.run(build.tool_cmd(compiler, "error_index_generator")
141-
.arg("markdown")
142-
.arg(&output)
143-
.env("CFG_BUILD", &build.config.build));
144-
145-
markdown_test(build, compiler, &output);
146-
}
147-
148-
fn markdown_test(build: &Build, compiler: &Compiler, markdown: &Path) {
149-
let mut cmd = Command::new(build.rustdoc(compiler));
150-
build.add_rustc_lib_path(compiler, &mut cmd);
151-
cmd.arg("--test");
152-
cmd.arg(markdown);
153-
cmd.arg("--test-args").arg(build.flags.args.join(" "));
154-
build.run(&mut cmd);
155-
}

‎branches/try/src/bootstrap/build/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,6 @@ impl Build {
308308
check::compiletest(self, &compiler, target.target,
309309
"compile-fail", "compile-fail-fulldeps")
310310
}
311-
CheckDocs { compiler } => {
312-
check::docs(self, &compiler);
313-
}
314-
CheckErrorIndex { compiler } => {
315-
check::error_index(self, &compiler);
316-
}
317311

318312
DistDocs { stage } => dist::docs(self, stage, target.target),
319313
DistMingw { _dummy } => dist::mingw(self, target.target),

‎branches/try/src/bootstrap/build/step.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ macro_rules! targets {
9696
(check_rpass_valgrind, CheckRPassValgrind { compiler: Compiler<'a> }),
9797
(check_rpass_full, CheckRPassFull { compiler: Compiler<'a> }),
9898
(check_cfail_full, CheckCFailFull { compiler: Compiler<'a> }),
99-
(check_docs, CheckDocs { compiler: Compiler<'a> }),
100-
(check_error_index, CheckErrorIndex { compiler: Compiler<'a> }),
10199

102100
// Distribution targets, creating tarballs
103101
(dist, Dist { stage: u32 }),
@@ -343,10 +341,7 @@ impl<'a> Step<'a> {
343341
self.check_rpass_valgrind(compiler),
344342
self.check_rpass_full(compiler),
345343
self.check_cfail_full(compiler),
346-
self.check_error_index(compiler),
347-
self.check_docs(compiler),
348344
self.check_linkcheck(stage),
349-
self.check_tidy(stage),
350345
self.dist(stage),
351346
]
352347
}
@@ -388,12 +383,6 @@ impl<'a> Step<'a> {
388383
vec![self.librustc(compiler),
389384
self.tool_compiletest(compiler.stage)]
390385
}
391-
Source::CheckDocs { compiler } => {
392-
vec![self.libstd(compiler)]
393-
}
394-
Source::CheckErrorIndex { compiler } => {
395-
vec![self.libstd(compiler), self.tool_error_index(compiler.stage)]
396-
}
397386

398387
Source::ToolLinkchecker { stage } |
399388
Source::ToolTidy { stage } => {
@@ -416,14 +405,7 @@ impl<'a> Step<'a> {
416405
vec![self.rustc(stage)]
417406
}
418407
Source::DistStd { compiler } => {
419-
// We want to package up as many target libraries as possible
420-
// for the `rust-std` package, so if this is a host target we
421-
// depend on librustc and otherwise we just depend on libtest.
422-
if build.config.host.iter().any(|t| t == self.target) {
423-
vec![self.librustc(compiler)]
424-
} else {
425-
vec![self.libtest(compiler)]
426-
}
408+
vec![self.libtest(compiler)]
427409
}
428410

429411
Source::Dist { stage } => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ libraries.
99

1010
To generate HTML documentation from one source file/crate, do something like:
1111

12-
~~~~text
12+
~~~~
1313
rustdoc --output html-doc/ --output-format html ../src/libstd/path.rs
1414
~~~~
1515

@@ -20,7 +20,7 @@ rustdoc --output html-doc/ --output-format html ../src/libstd/path.rs
2020
To generate an HTML version of a doc from Markdown manually, you can do
2121
something like:
2222

23-
~~~~text
23+
~~~~
2424
rustdoc reference.md
2525
~~~~
2626

‎branches/try/src/doc/book/const-and-static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ the result of a function call or anything similarly complex or at runtime.
7979

8080
Almost always, if you can choose between the two, choose `const`. It’s pretty
8181
rare that you actually want a memory location associated with your constant,
82-
and using a `const` allows for optimizations like constant propagation not only
82+
and using a const allows for optimizations like constant propagation not only
8383
in your crate but downstream crates.

‎branches/try/src/doc/book/getting-started.md

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ Specifically they will each satisfy the following requirements:
3939

4040
| Target | std |rustc|cargo| notes |
4141
|-------------------------------|-----|-----|-----|----------------------------|
42-
| `i686-apple-darwin` | ✓ | ✓ | ✓ | 32-bit OSX (10.7+, Lion+) |
43-
| `i686-pc-windows-gnu` | ✓ | ✓ | ✓ | 32-bit MinGW (Windows 7+) |
4442
| `i686-pc-windows-msvc` | ✓ | ✓ | ✓ | 32-bit MSVC (Windows 7+) |
45-
| `i686-unknown-linux-gnu` | ✓ | ✓ | ✓ | 32-bit Linux (2.6.18+) |
46-
| `x86_64-apple-darwin` | ✓ | ✓ | ✓ | 64-bit OSX (10.7+, Lion+) |
47-
| `x86_64-pc-windows-gnu` | ✓ | ✓ | ✓ | 64-bit MinGW (Windows 7+) |
4843
| `x86_64-pc-windows-msvc` | ✓ | ✓ | ✓ | 64-bit MSVC (Windows 7+) |
44+
| `i686-pc-windows-gnu` | ✓ | ✓ | ✓ | 32-bit MinGW (Windows 7+) |
45+
| `x86_64-pc-windows-gnu` | ✓ | ✓ | ✓ | 64-bit MinGW (Windows 7+) |
46+
| `i686-apple-darwin` | ✓ | ✓ | ✓ | 32-bit OSX (10.7+, Lion+) |
47+
| `x86_64-apple-darwin` | ✓ | ✓ | ✓ | 64-bit OSX (10.7+, Lion+) |
48+
| `i686-unknown-linux-gnu` | ✓ | ✓ | ✓ | 32-bit Linux (2.6.18+) |
4949
| `x86_64-unknown-linux-gnu` | ✓ | ✓ | ✓ | 64-bit Linux (2.6.18+) |
5050

5151
### Tier 2
@@ -63,28 +63,13 @@ these platforms are required to have each of the following:
6363

6464
| Target | std |rustc|cargo| notes |
6565
|-------------------------------|-----|-----|-----|----------------------------|
66-
| `aarch64-apple-ios` | ✓ | | | ARM64 iOS |
67-
| `aarch64-unknown-linux-gnu` | ✓ | ✓ | ✓ | ARM64 Linux (2.6.18+) |
66+
| `x86_64-unknown-linux-musl` | ✓ | | | 64-bit Linux with MUSL |
6867
| `arm-linux-androideabi` | ✓ | | | ARM Android |
69-
| `arm-unknown-linux-gnueabi` | ✓ | ✓ | ✓ | ARM Linux (2.6.18+) |
70-
| `arm-unknown-linux-gnueabihf` | ✓ | ✓ | ✓ | ARM Linux (2.6.18+) |
71-
| `armv7-apple-ios` | ✓ | | | ARM iOS |
72-
|`armv7-unknown-linux-gnueabihf`| ✓ | ✓ | ✓ | ARMv7 Linux (2.6.18+) |
73-
| `armv7s-apple-ios` | ✓ | | | ARM iOS |
74-
| `i386-apple-ios` | ✓ | | | 32-bit x86 iOS |
75-
| `i586-pc-windows-msvc` | ✓ | | | 32-bit Windows w/o SSE |
68+
| `arm-unknown-linux-gnueabi` | ✓ | ✓ | | ARM Linux (2.6.18+) |
69+
| `arm-unknown-linux-gnueabihf` | ✓ | ✓ | | ARM Linux (2.6.18+) |
70+
| `aarch64-unknown-linux-gnu` | ✓ | | | ARM64 Linux (2.6.18+) |
7671
| `mips-unknown-linux-gnu` | ✓ | | | MIPS Linux (2.6.18+) |
77-
| `mips-unknown-linux-musl` | ✓ | | | MIPS Linux with MUSL |
7872
| `mipsel-unknown-linux-gnu` | ✓ | | | MIPS (LE) Linux (2.6.18+) |
79-
| `mipsel-unknown-linux-musl` | ✓ | | | MIPS (LE) Linux with MUSL |
80-
| `powerpc-unknown-linux-gnu` | ✓ | | | PowerPC Linux (2.6.18+) |
81-
| `powerpc64-unknown-linux-gnu` | ✓ | | | PPC64 Linux (2.6.18+) |
82-
|`powerpc64le-unknown-linux-gnu`| ✓ | | | PPC64LE Linux (2.6.18+) |
83-
| `x86_64-apple-ios` | ✓ | | | 64-bit x86 iOS |
84-
| `x86_64-rumprun-netbsd` | ✓ | | | 64-bit NetBSD Rump Kernel |
85-
| `x86_64-unknown-freebsd` | ✓ | ✓ | ✓ | 64-bit FreeBSD |
86-
| `x86_64-unknown-linux-musl` | ✓ | | | 64-bit Linux with MUSL |
87-
| `x86_64-unknown-netbsd` | ✓ | ✓ | ✓ | 64-bit NetBSD |
8873

8974
### Tier 3
9075

@@ -97,15 +82,27 @@ unofficial locations.
9782

9883
| Target | std |rustc|cargo| notes |
9984
|-------------------------------|-----|-----|-----|----------------------------|
100-
| `aarch64-linux-android` | ✓ | | | ARM64 Android |
10185
| `i686-linux-android` | ✓ | | | 32-bit x86 Android |
102-
| `i686-pc-windows-msvc` (XP) | ✓ | | | Windows XP support |
86+
| `aarch64-linux-android` | ✓ | | | ARM64 Android |
87+
| `powerpc-unknown-linux-gnu` | ✓ | | | PowerPC Linux (2.6.18+) |
88+
| `powerpc64-unknown-linux-gnu` | ✓ | | | PPC64 Linux (2.6.18+) |
89+
|`powerpc64le-unknown-linux-gnu`| ✓ | | | PPC64LE Linux (2.6.18+) |
90+
|`armv7-unknown-linux-gnueabihf`| ✓ | | | ARMv7 Linux (2.6.18+) |
91+
| `i386-apple-ios` | ✓ | | | 32-bit x86 iOS |
92+
| `x86_64-apple-ios` | ✓ | | | 64-bit x86 iOS |
93+
| `armv7-apple-ios` | ✓ | | | ARM iOS |
94+
| `armv7s-apple-ios` | ✓ | | | ARM iOS |
95+
| `aarch64-apple-ios` | ✓ | | | ARM64 iOS |
10396
| `i686-unknown-freebsd` | ✓ | ✓ | ✓ | 32-bit FreeBSD |
104-
| `x86_64-pc-windows-msvc` (XP) | ✓ | | | Windows XP support |
105-
| `x86_64-sun-solaris` | ✓ | ✓ | | 64-bit Solaris/SunOS |
97+
| `x86_64-unknown-freebsd` | ✓ | ✓ | ✓ | 64-bit FreeBSD |
98+
| `x86_64-unknown-openbsd` | ✓ | ✓ | | 64-bit OpenBSD |
99+
| `x86_64-unknown-netbsd` | ✓ | ✓ | | 64-bit NetBSD |
106100
| `x86_64-unknown-bitrig` | ✓ | ✓ | | 64-bit Bitrig |
107101
| `x86_64-unknown-dragonfly` | ✓ | ✓ | | 64-bit DragonFlyBSD |
108-
| `x86_64-unknown-openbsd` | ✓ | ✓ | | 64-bit OpenBSD |
102+
| `x86_64-rumprun-netbsd` | ✓ | | | 64-bit NetBSD Rump Kernel |
103+
| `x86_64-sun-solaris` | ✓ | ✓ | | 64-bit Solaris/SunOS |
104+
| `i686-pc-windows-msvc` (XP) | ✓ | | | Windows XP support |
105+
| `x86_64-pc-windows-msvc` (XP) | ✓ | | | Windows XP support |
109106

110107
Note that this table can be expanded over time, this isn't the exhaustive set of
111108
tier 3 platforms that will ever be!

‎branches/try/src/doc/nomicon/subtyping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ inferred variance, so `Fn(T)` is invariant in `T`).
5353
Some important variances:
5454

5555
* `&'a T` is variant over `'a` and `T` (as is `*const T` by metaphor)
56-
* `&'a mut T` is variant over `'a` but invariant over `T`
56+
* `&'a mut T` is variant with over `'a` but invariant over `T`
5757
* `Fn(T) -> U` is invariant over `T`, but variant over `U`
5858
* `Box`, `Vec`, and all other collections are variant over the types of
5959
their contents

‎branches/try/src/doc/style/errors/ergonomics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pattern.
99

1010
Prefer
1111

12-
```rust,ignore
12+
```rust
1313
use std::io::{File, Open, Write, IoError};
1414

1515
struct Info {
@@ -31,7 +31,7 @@ fn write_info(info: &Info) -> Result<(), IoError> {
3131

3232
over
3333

34-
```rust,ignore
34+
```rust
3535
use std::io::{File, Open, Write, IoError};
3636

3737
struct Info {

‎branches/try/src/doc/style/features/functions-and-methods/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
Prefer
66

7-
```rust,ignore
7+
```rust
88
impl Foo {
99
pub fn frob(&self, w: widget) { ... }
1010
}
1111
```
1212

1313
over
1414

15-
```rust,ignore
15+
```rust
1616
pub fn frob(foo: &Foo, w: widget) { ... }
1717
```
1818

0 commit comments

Comments
 (0)