Skip to content

Commit b32a96c

Browse files
committed
Move test to be make instead of ui
1 parent caebb07 commit b32a96c

8 files changed

+46
-132
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#![crate_name = "dependency"]
2+
#![crate_type = "rlib"]
3+
pub struct Type;
4+
pub trait Trait {}
5+
impl Trait for Type {}
6+
pub fn do_something<X: Trait>(_: X) {}

tests/ui/crate-loading/auxiliary/multiple-dep-versions-2.rs renamed to tests/run-make/crate-loading/multiple-dep-versions-2.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#![crate_name="dependency"]
2-
//@ edition:2021
3-
//@ compile-flags: -C metadata=2 -C extra-filename=-2
1+
#![crate_name = "dependency"]
2+
#![crate_type = "rlib"]
43
pub struct Type(pub i32);
54
pub trait Trait {}
65
impl Trait for Type {}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
extern crate dep_2_reexport;
2+
extern crate dependency;
3+
use dep_2_reexport::do_something;
4+
use dependency::Type;
5+
6+
fn main() {
7+
do_something(Type);
8+
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//@ only-linux
2+
//@ ignore-wasm32
3+
4+
use run_make_support::rfs::copy;
5+
use run_make_support::{assert_contains, rust_lib_name, rustc};
6+
7+
fn main() {
8+
rustc().input("multiple-dep-versions-1.rs").run();
9+
rustc().input("multiple-dep-versions-2.rs").extra_filename("2").metadata("2").run();
10+
11+
let out = rustc()
12+
.input("multiple-dep-versions.rs")
13+
.extern_("dependency", rust_lib_name("dependency"))
14+
.extern_("dep_2_reexport", rust_lib_name("dependency2"))
15+
.inspect(|cmd| eprintln!("{cmd:?}"))
16+
.run_fail();
17+
let stderr = out.stderr_utf8();
18+
assert_contains(
19+
&stderr,
20+
"you have multiple different versions of crate `dependency` in your dependency graph",
21+
);
22+
assert_contains(
23+
&stderr,
24+
"two types coming from two different versions of the same crate are different types even \
25+
if they look the same",
26+
);
27+
assert_contains(&stderr, "this type doesn't implement the required trait");
28+
assert_contains(&stderr, "this type implements the required trait");
29+
assert_contains(&stderr, "this is the required trait");
30+
}

tests/ui/crate-loading/auxiliary/dep-2-reexport.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/ui/crate-loading/auxiliary/multiple-dep-versions-1.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/ui/crate-loading/multiple-dep-versions.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/ui/crate-loading/multiple-dep-versions.svg

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)