Skip to content

Commit 5e26c8d

Browse files
committed
Move test to be make instead of ui
1 parent f4bad4f commit 5e26c8d

8 files changed

+47
-132
lines changed
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

+2-3
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 {}
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

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

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

-4
This file was deleted.

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

-7
This file was deleted.

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

-15
This file was deleted.

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

-103
This file was deleted.

0 commit comments

Comments
 (0)