Skip to content

Commit 7240a7f

Browse files
committed
---
yaml --- r: 15402 b: refs/heads/try c: 0094ffd h: refs/heads/master v: v3
1 parent 62a2ee3 commit 7240a7f

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: e0f2341da1eeb84584a04dbf3ac908b344b0dce4
5+
refs/heads/try: 0094ffd99b09f2fc8c639df28b12e10211cff6ce
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/test/auxiliary/crateresolve5-1.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ fn structural() -> { name: str, val: int } {
77
{ name: "crateresolve5", val: 10 }
88
}
99

10+
enum e {
11+
e_val
12+
}
13+
14+
fn nominal() -> e { e_val }
15+
1016
fn f() -> int { 10 }

branches/try/src/test/auxiliary/crateresolve5-2.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ fn structural() -> { name: str, val: int } {
77
{ name: "crateresolve5", val: 10 }
88
}
99

10+
enum e {
11+
e_val
12+
}
13+
14+
fn nominal() -> e { e_val }
15+
1016
fn f() -> int { 20 }
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// xfail-fast
2+
// aux-build:crateresolve5-1.rs
3+
// aux-build:crateresolve5-2.rs
4+
// error-pattern:mismatched types
5+
6+
use cr5_1 (name = "crateresolve5", vers = "0.1");
7+
use cr5_2 (name = "crateresolve5", vers = "0.2");
8+
9+
fn main() {
10+
// Nominal types from two multiple versions of a crate are different types
11+
assert cr5_1::nominal() == cr5_2::nominal();
12+
}

0 commit comments

Comments
 (0)