Skip to content

Commit 0558a0e

Browse files
authored
Rollup merge of rust-lang#146875 - Enselic:better-file-names, r=jieyouxu
tests/run-make/crate-loading: Rename source files for clarity For rust-lang#146874 I originally tried to extend the existing test **tests/run-make/crate-loading**. That didn't work out since adding a re-export of the entire crate significantly changes the emitted error messsage. I did put some effort into making that test easier to understand however, by renaming its files. (Since I was confused myself at first.) Let's save some time for future devs by doing just the renames. Further cleanups are possible, but that will change the blessed output, so let's not do that right now. r? `@jieyouxu` since you have the context of rust-lang#146874
2 parents 951e874 + 2dc1354 commit 0558a0e

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/run-make/crate-loading/rmake.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
use run_make_support::{diff, rust_lib_name, rustc};
77

88
fn main() {
9-
rustc().input("multiple-dep-versions-1.rs").run();
10-
rustc().input("multiple-dep-versions-2.rs").extra_filename("2").metadata("2").run();
11-
rustc()
12-
.input("multiple-dep-versions-3.rs")
13-
.extern_("dependency", rust_lib_name("dependency2"))
14-
.run();
9+
rustc().input("dependency-1.rs").run();
10+
rustc().input("dependency-2.rs").extra_filename("2").metadata("2").run();
11+
rustc().input("dep-2-reexport.rs").extern_("dependency", rust_lib_name("dependency2")).run();
1512

1613
let out = rustc()
1714
.input("multiple-dep-versions.rs")

0 commit comments

Comments
 (0)