Skip to content

Commit 2c5ce8c

Browse files
borsbors
committed
Auto merge of #33597 - eddyb:rollup, r=eddyb
Rollup of 23 pull requests - Successful merges: #33282, #33342, #33393, #33450, #33513, #33517, #33531, #33532, #33533, #33534, #33538, #33541, #33544, #33552, #33555, #33560, #33563, #33565, #33566, #33572, #33580, #33590, #33596 - Failed merges: #33578
2 parents e88defe + dbd5968 commit 2c5ce8c

File tree

72 files changed

+2637
-2147
lines changed

Some content is hidden

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

72 files changed

+2637
-2147
lines changed

Diff for: ‎src/bootstrap/build/check.rs

+77-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
//! This file implements the various regression test suites that we execute on
1414
//! our CI.
1515
16-
use std::fs;
16+
use std::env;
17+
use std::fs::{self, File};
18+
use std::io::prelude::*;
1719
use std::path::{PathBuf, Path};
1820
use std::process::Command;
1921

2022
use build_helper::output;
23+
use bootstrap::{dylib_path, dylib_path_var};
2124

22-
use build::{Build, Compiler};
25+
use build::{Build, Compiler, Mode};
2326

2427
/// Runs the `linkchecker` tool as compiled in `stage` by the `host` compiler.
2528
///
@@ -222,3 +225,75 @@ fn markdown_test(build: &Build, compiler: &Compiler, markdown: &Path) {
222225
cmd.arg("--test-args").arg(build.flags.args.join(" "));
223226
build.run(&mut cmd);
224227
}
228+
229+
/// Run all unit tests plus documentation tests for an entire crate DAG defined
230+
/// by a `Cargo.toml`
231+
///
232+
/// This is what runs tests for crates like the standard library, compiler, etc.
233+
/// It essentially is the driver for running `cargo test`.
234+
///
235+
/// Currently this runs all tests for a DAG by passing a bunch of `-p foo`
236+
/// arguments, and those arguments are discovered from `Cargo.lock`.
237+
pub fn krate(build: &Build,
238+
compiler: &Compiler,
239+
target: &str,
240+
mode: Mode) {
241+
let (name, path, features) = match mode {
242+
Mode::Libstd => ("libstd", "src/rustc/std_shim", build.std_features()),
243+
Mode::Libtest => ("libtest", "src/rustc/test_shim", String::new()),
244+
Mode::Librustc => ("librustc", "src/rustc", build.rustc_features()),
245+
_ => panic!("can only test libraries"),
246+
};
247+
println!("Testing {} stage{} ({} -> {})", name, compiler.stage,
248+
compiler.host, target);
249+
250+
// Build up the base `cargo test` command.
251+
let mut cargo = build.cargo(compiler, mode, target, "test");
252+
cargo.arg("--manifest-path")
253+
.arg(build.src.join(path).join("Cargo.toml"))
254+
.arg("--features").arg(features);
255+
256+
// Generate a list of `-p` arguments to pass to the `cargo test` invocation
257+
// by crawling the corresponding Cargo.lock file.
258+
let lockfile = build.src.join(path).join("Cargo.lock");
259+
let mut contents = String::new();
260+
t!(t!(File::open(&lockfile)).read_to_string(&mut contents));
261+
let mut lines = contents.lines();
262+
while let Some(line) = lines.next() {
263+
let prefix = "name = \"";
264+
if !line.starts_with(prefix) {
265+
continue
266+
}
267+
lines.next(); // skip `version = ...`
268+
269+
// skip crates.io or otherwise non-path crates
270+
if let Some(line) = lines.next() {
271+
if line.starts_with("source") {
272+
continue
273+
}
274+
}
275+
276+
let crate_name = &line[prefix.len()..line.len() - 1];
277+
278+
// Right now jemalloc is our only target-specific crate in the sense
279+
// that it's not present on all platforms. Custom skip it here for now,
280+
// but if we add more this probably wants to get more generalized.
281+
if crate_name.contains("jemalloc") {
282+
continue
283+
}
284+
285+
cargo.arg("-p").arg(crate_name);
286+
}
287+
288+
// The tests are going to run with the *target* libraries, so we need to
289+
// ensure that those libraries show up in the LD_LIBRARY_PATH equivalent.
290+
//
291+
// Note that to run the compiler we need to run with the *host* libraries,
292+
// but our wrapper scripts arrange for that to be the case anyway.
293+
let mut dylib_path = dylib_path();
294+
dylib_path.insert(0, build.sysroot_libdir(compiler, target));
295+
cargo.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
296+
cargo.args(&build.flags.args);
297+
298+
build.run(&mut cargo);
299+
}

Diff for: ‎src/bootstrap/build/mod.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,15 @@ impl Build {
380380
check::compiletest(self, &compiler, target.target,
381381
"run-make", "run-make")
382382
}
383+
CheckCrateStd { compiler } => {
384+
check::krate(self, &compiler, target.target, Mode::Libstd)
385+
}
386+
CheckCrateTest { compiler } => {
387+
check::krate(self, &compiler, target.target, Mode::Libtest)
388+
}
389+
CheckCrateRustc { compiler } => {
390+
check::krate(self, &compiler, target.target, Mode::Librustc)
391+
}
383392

384393
DistDocs { stage } => dist::docs(self, stage, target.target),
385394
DistMingw { _dummy } => dist::mingw(self, target.target),
@@ -485,6 +494,7 @@ impl Build {
485494
self.config.rust_debug_assertions.to_string())
486495
.env("RUSTC_SNAPSHOT", &self.rustc)
487496
.env("RUSTC_SYSROOT", self.sysroot(compiler))
497+
.env("RUSTC_LIBDIR", self.rustc_libdir(compiler))
488498
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir())
489499
.env("RUSTC_RPATH", self.config.rust_rpath.to_string())
490500
.env("RUSTDOC", self.out.join("bootstrap/debug/rustdoc"))
@@ -520,7 +530,6 @@ impl Build {
520530
if self.config.rust_optimize {
521531
cargo.arg("--release");
522532
}
523-
self.add_rustc_lib_path(compiler, &mut cargo);
524533
return cargo
525534
}
526535

Diff for: ‎src/bootstrap/build/step.rs

+15
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ macro_rules! targets {
120120
(check_docs, CheckDocs { compiler: Compiler<'a> }),
121121
(check_error_index, CheckErrorIndex { compiler: Compiler<'a> }),
122122
(check_rmake, CheckRMake { compiler: Compiler<'a> }),
123+
(check_crate_std, CheckCrateStd { compiler: Compiler<'a> }),
124+
(check_crate_test, CheckCrateTest { compiler: Compiler<'a> }),
125+
(check_crate_rustc, CheckCrateRustc { compiler: Compiler<'a> }),
123126

124127
// Distribution targets, creating tarballs
125128
(dist, Dist { stage: u32 }),
@@ -376,6 +379,9 @@ impl<'a> Step<'a> {
376379
self.check_cfail(compiler),
377380
self.check_rfail(compiler),
378381
self.check_pfail(compiler),
382+
self.check_crate_std(compiler),
383+
self.check_crate_test(compiler),
384+
self.check_crate_rustc(compiler),
379385
self.check_codegen(compiler),
380386
self.check_codegen_units(compiler),
381387
self.check_debuginfo(compiler),
@@ -437,6 +443,15 @@ impl<'a> Step<'a> {
437443
Source::CheckErrorIndex { compiler } => {
438444
vec![self.libstd(compiler), self.tool_error_index(compiler.stage)]
439445
}
446+
Source::CheckCrateStd { compiler } => {
447+
vec![self.libtest(compiler)]
448+
}
449+
Source::CheckCrateTest { compiler } => {
450+
vec![self.libtest(compiler)]
451+
}
452+
Source::CheckCrateRustc { compiler } => {
453+
vec![self.libtest(compiler)]
454+
}
440455

441456
Source::ToolLinkchecker { stage } |
442457
Source::ToolTidy { stage } => {

Diff for: ‎src/bootstrap/rustc.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ extern crate bootstrap;
2929

3030
use std::env;
3131
use std::ffi::OsString;
32+
use std::path::PathBuf;
3233
use std::process::Command;
3334

3435
fn main() {
@@ -43,16 +44,22 @@ fn main() {
4344
// have the standard library built yet and may not be able to produce an
4445
// executable. Otherwise we just use the standard compiler we're
4546
// bootstrapping with.
46-
let rustc = if target.is_none() {
47-
env::var_os("RUSTC_SNAPSHOT").unwrap()
47+
let (rustc, libdir) = if target.is_none() {
48+
("RUSTC_SNAPSHOT", "RUSTC_SNAPSHOT_LIBDIR")
4849
} else {
49-
env::var_os("RUSTC_REAL").unwrap()
50+
("RUSTC_REAL", "RUSTC_LIBDIR")
5051
};
5152
let stage = env::var("RUSTC_STAGE").unwrap();
5253

54+
let rustc = env::var_os(rustc).unwrap();
55+
let libdir = env::var_os(libdir).unwrap();
56+
let mut dylib_path = bootstrap::dylib_path();
57+
dylib_path.insert(0, PathBuf::from(libdir));
58+
5359
let mut cmd = Command::new(rustc);
5460
cmd.args(&args)
55-
.arg("--cfg").arg(format!("stage{}", stage));
61+
.arg("--cfg").arg(format!("stage{}", stage))
62+
.env(bootstrap::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
5663

5764
if let Some(target) = target {
5865
// The stage0 compiler has a special sysroot distinct from what we

Diff for: ‎src/bootstrap/rustdoc.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,25 @@
1212
//!
1313
//! See comments in `src/bootstrap/rustc.rs` for more information.
1414
15+
extern crate bootstrap;
16+
1517
use std::env;
1618
use std::process::Command;
19+
use std::path::PathBuf;
1720

1821
fn main() {
1922
let args = env::args_os().skip(1).collect::<Vec<_>>();
2023
let rustdoc = env::var_os("RUSTDOC_REAL").unwrap();
24+
let libdir = env::var_os("RUSTC_LIBDIR").unwrap();
25+
26+
let mut dylib_path = bootstrap::dylib_path();
27+
dylib_path.insert(0, PathBuf::from(libdir));
2128

2229
let mut cmd = Command::new(rustdoc);
2330
cmd.args(&args)
2431
.arg("--cfg").arg(format!("stage{}", env::var("RUSTC_STAGE").unwrap()))
25-
.arg("--cfg").arg("dox");
32+
.arg("--cfg").arg("dox")
33+
.env(bootstrap::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
2634
std::process::exit(match cmd.status() {
2735
Ok(s) => s.code().unwrap_or(1),
2836
Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),

Diff for: ‎src/etc/local_stage0.sh

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_D
5555
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
5656
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
5757
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
58+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}flate*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
59+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}fmt_macros*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
60+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}getopts*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
61+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}graphviz*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
62+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}log*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
63+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rbml*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
64+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}serialize*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
65+
cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}term*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
5866

5967
# do not fail if one of the above fails, as all we need is a working rustc!
6068
exit 0

Diff for: ‎src/liballoc/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ version = "0.0.0"
66
[lib]
77
name = "alloc"
88
path = "lib.rs"
9-
test = false
109

1110
[dependencies]
1211
core = { path = "../libcore" }

Diff for: ‎src/liballoc/boxed.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -525,14 +525,16 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {}
525525
/// }
526526
/// ```
527527
#[rustc_paren_sugar]
528-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
528+
#[unstable(feature = "fnbox",
529+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
529530
pub trait FnBox<A> {
530531
type Output;
531532

532533
fn call_box(self: Box<Self>, args: A) -> Self::Output;
533534
}
534535

535-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
536+
#[unstable(feature = "fnbox",
537+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
536538
impl<A, F> FnBox<A> for F where F: FnOnce<A>
537539
{
538540
type Output = F::Output;
@@ -542,7 +544,8 @@ impl<A, F> FnBox<A> for F where F: FnOnce<A>
542544
}
543545
}
544546

545-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
547+
#[unstable(feature = "fnbox",
548+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
546549
impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> {
547550
type Output = R;
548551

@@ -551,7 +554,8 @@ impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> {
551554
}
552555
}
553556

554-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
557+
#[unstable(feature = "fnbox",
558+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
555559
impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + Send + 'a> {
556560
type Output = R;
557561

Diff for: ‎src/liballoc_jemalloc/build.rs

+16
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![deny(warnings)]
12+
1113
extern crate build_helper;
1214
extern crate gcc;
1315

@@ -18,6 +20,7 @@ use build_helper::run;
1820

1921
fn main() {
2022
println!("cargo:rustc-cfg=cargobuild");
23+
println!("cargo:rerun-if-changed=build.rs");
2124

2225
let target = env::var("TARGET").unwrap();
2326
let host = env::var("HOST").unwrap();
@@ -40,6 +43,19 @@ fn main() {
4043
let cflags = compiler.args().iter().map(|s| s.to_str().unwrap())
4144
.collect::<Vec<_>>().join(" ");
4245

46+
let mut stack = src_dir.join("../jemalloc")
47+
.read_dir().unwrap()
48+
.map(|e| e.unwrap())
49+
.collect::<Vec<_>>();
50+
while let Some(entry) = stack.pop() {
51+
let path = entry.path();
52+
if entry.file_type().unwrap().is_dir() {
53+
stack.extend(path.read_dir().unwrap().map(|e| e.unwrap()));
54+
} else {
55+
println!("cargo:rerun-if-changed={}", path.display());
56+
}
57+
}
58+
4359
let mut cmd = Command::new("sh");
4460
cmd.arg(src_dir.join("../jemalloc/configure").to_str().unwrap()
4561
.replace("C:\\", "/c/")

Diff for: ‎src/libcollections/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ version = "0.0.0"
66
[lib]
77
name = "collections"
88
path = "lib.rs"
9-
test = false
109

1110
[dependencies]
1211
alloc = { path = "../liballoc" }
1312
core = { path = "../libcore" }
1413
rustc_unicode = { path = "../librustc_unicode" }
14+
15+
[[test]]
16+
name = "collectionstest"
17+
path = "../libcollectionstest/lib.rs"

Diff for: ‎src/libcore/Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ build = "build.rs"
88
name = "core"
99
path = "lib.rs"
1010
test = false
11+
12+
[[test]]
13+
name = "coretest"
14+
path = "../libcoretest/lib.rs"

Diff for: ‎src/libcore/build.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![deny(warnings)]
12+
1113
fn main() {
1214
// Remove this whenever snapshots and rustbuild nightlies are synced.
1315
println!("cargo:rustc-cfg=cargobuild");
16+
println!("cargo:rerun-if-changed=build.rs")
1417
}

Diff for: ‎src/libcore/sync/atomic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ pub enum Ordering {
142142
#[stable(feature = "rust1", since = "1.0.0")]
143143
Relaxed,
144144
/// When coupled with a store, all previous writes become visible
145-
/// to another thread that performs a load with `Acquire` ordering
145+
/// to the other threads that perform a load with `Acquire` ordering
146146
/// on the same value.
147147
#[stable(feature = "rust1", since = "1.0.0")]
148148
Release,
149149
/// When coupled with a load, all subsequent loads will see data
150150
/// written before a store with `Release` ordering on the same value
151-
/// in another thread.
151+
/// in other threads.
152152
#[stable(feature = "rust1", since = "1.0.0")]
153153
Acquire,
154154
/// When coupled with a load, uses `Acquire` ordering, and with a store

0 commit comments

Comments
 (0)