Skip to content

Commit d850515

Browse files
borsbors
committed
Auto merge of #39851 - alexcrichton:verify-unstable, r=brson
test: Verify all sysroot crates are unstable As we continue to add more crates to the compiler and use them to implement various features we want to be sure we're not accidentally expanding the API surface area of the compiler! To that end this commit adds a new `run-make` test which will attempt to `extern crate foo` all crates in the sysroot, verifying that they're all unstable. This commit discovered that the `std_shim` and `test_shim` crates were accidentally stable and fixes the situation by deleting those shims. The shims are no longer necessary due to changes in Cargo that have happened since they were originally incepted.
2 parents bfe4597 + 40aaa65 commit d850515

File tree

14 files changed

+71
-158
lines changed

14 files changed

+71
-158
lines changed

‎src/Cargo.lock

-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
members = [
33
"bootstrap",
44
"rustc",
5-
"rustc/std_shim",
6-
"rustc/test_shim",
5+
"libstd",
6+
"libtest",
77
"tools/cargotest",
88
"tools/compiletest",
99
"tools/error_index_generator",

‎src/bootstrap/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ build/
267267
The current build is unfortunately not quite as simple as `cargo build` in a
268268
directory, but rather the compiler is split into three different Cargo projects:
269269

270-
* `src/rustc/std_shim` - a project which builds and compiles libstd
271-
* `src/rustc/test_shim` - a project which builds and compiles libtest
270+
* `src/libstd` - the standard library
271+
* `src/libtest` - testing support, depends on libstd
272272
* `src/rustc` - the actual compiler itself
273273

274274
Each "project" has a corresponding Cargo.lock file with all dependencies, and

‎src/bootstrap/check.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,10 @@ pub fn krate(build: &Build,
346346
krate: Option<&str>) {
347347
let (name, path, features, root) = match mode {
348348
Mode::Libstd => {
349-
("libstd", "src/rustc/std_shim", build.std_features(), "std_shim")
349+
("libstd", "src/libstd", build.std_features(), "std")
350350
}
351351
Mode::Libtest => {
352-
("libtest", "src/rustc/test_shim", String::new(), "test_shim")
352+
("libtest", "src/libtest", String::new(), "test")
353353
}
354354
Mode::Librustc => {
355355
("librustc", "src/rustc", build.rustc_features(), "rustc-main")

‎src/bootstrap/compile.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub fn std(build: &Build, target: &str, compiler: &Compiler) {
6464
}
6565
cargo.arg("--features").arg(features)
6666
.arg("--manifest-path")
67-
.arg(build.src.join("src/rustc/std_shim/Cargo.toml"));
67+
.arg(build.src.join("src/libstd/Cargo.toml"));
6868

6969
if let Some(target) = build.config.target_config.get(target) {
7070
if let Some(ref jemalloc) = target.jemalloc {
@@ -162,7 +162,7 @@ pub fn test(build: &Build, target: &str, compiler: &Compiler) {
162162
build.clear_if_dirty(&out_dir, &libstd_stamp(build, compiler, target));
163163
let mut cargo = build.cargo(compiler, Mode::Libtest, target, "build");
164164
cargo.arg("--manifest-path")
165-
.arg(build.src.join("src/rustc/test_shim/Cargo.toml"));
165+
.arg(build.src.join("src/libtest/Cargo.toml"));
166166
build.run(&mut cargo);
167167
update_mtime(build, &libtest_stamp(build, compiler, target));
168168
}

‎src/bootstrap/doc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pub fn std(build: &Build, stage: u32, target: &str) {
148148

149149
let mut cargo = build.cargo(&compiler, Mode::Libstd, target, "doc");
150150
cargo.arg("--manifest-path")
151-
.arg(build.src.join("src/rustc/std_shim/Cargo.toml"))
151+
.arg(build.src.join("src/libstd/Cargo.toml"))
152152
.arg("--features").arg(build.std_features());
153153

154154
// We don't want to build docs for internal std dependencies unless
@@ -194,7 +194,7 @@ pub fn test(build: &Build, stage: u32, target: &str) {
194194

195195
let mut cargo = build.cargo(&compiler, Mode::Libtest, target, "doc");
196196
cargo.arg("--manifest-path")
197-
.arg(build.src.join("src/rustc/test_shim/Cargo.toml"));
197+
.arg(build.src.join("src/libtest/Cargo.toml"));
198198
build.run(&mut cargo);
199199
cp_r(&out_dir, &out)
200200
}

‎src/bootstrap/metadata.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ struct ResolveNode {
4343
}
4444

4545
pub fn build(build: &mut Build) {
46-
build_krate(build, "src/rustc/std_shim");
47-
build_krate(build, "src/rustc/test_shim");
46+
build_krate(build, "src/libstd");
47+
build_krate(build, "src/libtest");
4848
build_krate(build, "src/rustc");
4949
}
5050

‎src/bootstrap/step.rs

+25-25
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
246246
crate_rule(build,
247247
&mut rules,
248248
"libstd-link",
249-
"build-crate-std_shim",
249+
"build-crate-std",
250250
compile::std_link)
251251
.dep(|s| s.name("startup-objects"))
252252
.dep(|s| s.name("create-sysroot").target(s.host));
253253
crate_rule(build,
254254
&mut rules,
255255
"libtest-link",
256-
"build-crate-test_shim",
256+
"build-crate-test",
257257
compile::test_link)
258258
.dep(|s| s.name("libstd-link"));
259259
crate_rule(build,
@@ -263,13 +263,13 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
263263
compile::rustc_link)
264264
.dep(|s| s.name("libtest-link"));
265265

266-
for (krate, path, _default) in krates("std_shim") {
266+
for (krate, path, _default) in krates("std") {
267267
rules.build(&krate.build_step, path)
268268
.dep(|s| s.name("startup-objects"))
269269
.dep(move |s| s.name("rustc").host(&build.config.build).target(s.host))
270270
.run(move |s| compile::std(build, s.target, &s.compiler()));
271271
}
272-
for (krate, path, _default) in krates("test_shim") {
272+
for (krate, path, _default) in krates("test") {
273273
rules.build(&krate.build_step, path)
274274
.dep(|s| s.name("libstd-link"))
275275
.run(move |s| compile::test(build, s.target, &s.compiler()));
@@ -384,7 +384,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
384384
"pretty", "run-fail-fulldeps");
385385
}
386386

387-
for (krate, path, _default) in krates("std_shim") {
387+
for (krate, path, _default) in krates("std") {
388388
rules.test(&krate.test_step, path)
389389
.dep(|s| s.name("libtest"))
390390
.dep(|s| s.name("emulator-copy-libs"))
@@ -400,7 +400,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
400400
Mode::Libstd, TestKind::Test, None));
401401

402402
// std benchmarks
403-
for (krate, path, _default) in krates("std_shim") {
403+
for (krate, path, _default) in krates("std") {
404404
rules.bench(&krate.bench_step, path)
405405
.dep(|s| s.name("libtest"))
406406
.dep(|s| s.name("emulator-copy-libs"))
@@ -415,7 +415,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
415415
.run(move |s| check::krate(build, &s.compiler(), s.target,
416416
Mode::Libstd, TestKind::Bench, None));
417417

418-
for (krate, path, _default) in krates("test_shim") {
418+
for (krate, path, _default) in krates("test") {
419419
rules.test(&krate.test_step, path)
420420
.dep(|s| s.name("libtest"))
421421
.dep(|s| s.name("emulator-copy-libs"))
@@ -601,13 +601,13 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
601601
.default(build.config.docs)
602602
.host(true)
603603
.run(move |s| doc::error_index(build, s.target));
604-
for (krate, path, default) in krates("std_shim") {
604+
for (krate, path, default) in krates("std") {
605605
rules.doc(&krate.doc_step, path)
606606
.dep(|s| s.name("libstd-link"))
607607
.default(default && build.config.docs)
608608
.run(move |s| doc::std(build, s.stage, s.target));
609609
}
610-
for (krate, path, default) in krates("test_shim") {
610+
for (krate, path, default) in krates("test") {
611611
rules.doc(&krate.doc_step, path)
612612
.dep(|s| s.name("libtest-link"))
613613
.default(default && build.config.compiler_docs)
@@ -1172,23 +1172,23 @@ mod tests {
11721172

11731173
let mut build = Build::new(flags, config);
11741174
let cwd = env::current_dir().unwrap();
1175-
build.crates.insert("std_shim".to_string(), ::Crate {
1176-
name: "std_shim".to_string(),
1175+
build.crates.insert("std".to_string(), ::Crate {
1176+
name: "std".to_string(),
11771177
deps: Vec::new(),
1178-
path: cwd.join("src/std_shim"),
1179-
doc_step: "doc-std_shim".to_string(),
1180-
build_step: "build-crate-std_shim".to_string(),
1181-
test_step: "test-std_shim".to_string(),
1182-
bench_step: "bench-std_shim".to_string(),
1178+
path: cwd.join("src/std"),
1179+
doc_step: "doc-std".to_string(),
1180+
build_step: "build-crate-std".to_string(),
1181+
test_step: "test-std".to_string(),
1182+
bench_step: "bench-std".to_string(),
11831183
});
1184-
build.crates.insert("test_shim".to_string(), ::Crate {
1185-
name: "test_shim".to_string(),
1184+
build.crates.insert("test".to_string(), ::Crate {
1185+
name: "test".to_string(),
11861186
deps: Vec::new(),
1187-
path: cwd.join("src/test_shim"),
1188-
doc_step: "doc-test_shim".to_string(),
1189-
build_step: "build-crate-test_shim".to_string(),
1190-
test_step: "test-test_shim".to_string(),
1191-
bench_step: "bench-test_shim".to_string(),
1187+
path: cwd.join("src/test"),
1188+
doc_step: "doc-test".to_string(),
1189+
build_step: "build-crate-test".to_string(),
1190+
test_step: "test-test".to_string(),
1191+
bench_step: "bench-test".to_string(),
11921192
});
11931193
build.crates.insert("rustc-main".to_string(), ::Crate {
11941194
name: "rustc-main".to_string(),
@@ -1378,7 +1378,7 @@ mod tests {
13781378
let all = rules.expand(&plan);
13791379
println!("all rules: {:#?}", all);
13801380
assert!(!all.contains(&step.name("rustc")));
1381-
assert!(!all.contains(&step.name("build-crate-std_shim").stage(1)));
1381+
assert!(!all.contains(&step.name("build-crate-std").stage(1)));
13821382

13831383
// all stage0 compiles should be for the build target, A
13841384
for step in all.iter().filter(|s| s.stage == 0) {
@@ -1443,7 +1443,7 @@ mod tests {
14431443

14441444
assert!(!plan.iter().any(|s| s.name.contains("rustc")));
14451445
assert!(plan.iter().all(|s| {
1446-
!s.name.contains("test_shim") || s.target == "C"
1446+
!s.name.contains("test") || s.target == "C"
14471447
}));
14481448
}
14491449

‎src/liballoc_jemalloc/lib.rs

-12
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,6 @@ mod imp {
122122
let flags = align_to_flags(align);
123123
unsafe { nallocx(size as size_t, flags) as usize }
124124
}
125-
126-
// These symbols are used by jemalloc on android but the really old android
127-
// we're building on doesn't have them defined, so just make sure the symbols
128-
// are available.
129-
#[no_mangle]
130-
#[cfg(all(target_os = "android", not(cargobuild)))]
131-
pub extern "C" fn pthread_atfork(_prefork: *mut u8,
132-
_postfork_parent: *mut u8,
133-
_postfork_child: *mut u8)
134-
-> i32 {
135-
0
136-
}
137125
}
138126

139127
#[cfg(dummy_jemalloc)]

‎src/rustc/std_shim/Cargo.toml

-46
This file was deleted.

‎src/rustc/std_shim/lib.rs

-17
This file was deleted.

‎src/rustc/test_shim/Cargo.toml

-16
This file was deleted.

‎src/rustc/test_shim/lib.rs

-15
This file was deleted.

‎src/test/run-make/sysroot-crates-are-unstable/Makefile

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
-include ../tools.mk
2+
3+
# This is a whitelist of crates which are stable, we don't check for the
4+
# instability of these crates as they're all stable!
5+
STABLE_CRATES := \
6+
std \
7+
core \
8+
proc_macro \
9+
rsbegin.o \
10+
rsend.o \
11+
dllcrt2.o \
12+
crt2.o
13+
14+
# Generate a list of all crates in the sysroot. To do this we list all files in
15+
# rustc's sysroot, look at the filename, strip everything after the `-`, and
16+
# strip the leading `lib` (if present)
17+
SYSROOT := $(shell $(RUSTC) --print sysroot)
18+
LIBS := $(wildcard $(SYSROOT)/lib/rustlib/$(TARGET)/lib/*)
19+
LIBS := $(foreach lib,$(LIBS),$(notdir $(lib)))
20+
LIBS := $(foreach lib,$(LIBS),$(word 1,$(subst -, ,$(lib))))
21+
LIBS := $(foreach lib,$(LIBS),$(patsubst lib%,%,$(lib)))
22+
LIBS := $(filter-out $(STABLE_CRATES),$(LIBS))
23+
24+
all: $(foreach lib,$(LIBS),check-crate-$(lib)-is-unstable)
25+
26+
check-crate-%-is-unstable:
27+
@echo verifying $* is an unstable crate
28+
@echo 'extern crate $*;' | \
29+
$(RUSTC) - --crate-type rlib 2>&1 | cat > $(TMPDIR)/$*; \
30+
true
31+
@grep -q 'use of unstable library feature' $(TMPDIR)/$* || \
32+
(echo crate $* is not unstable && \
33+
cat $(TMPDIR)/$* && \
34+
false)

0 commit comments

Comments
 (0)