Skip to content

Commit 822a058

Browse files
authored
Rollup merge of rust-lang#91411 - ChrisDenton:valid-paths, r=petrochenkov
Enable svh tests on msvc These tests were ignored for msvc in rust-lang#30778 because of additional notes that were being added for some reason. I'm fairly confident this has been fixed in the intervening years so lets try re-enabling these tests. Fixes rust-lang#31306
2 parents d96ce3e + a8e1ac9 commit 822a058

16 files changed

+8
-24
lines changed

src/test/ui/svh/changing-crates.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:changing-crates-a1.rs
53
// aux-build:changing-crates-b.rs

src/test/ui/svh/changing-crates.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/changing-crates.rs:10:1
2+
--> $DIR/changing-crates.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-lit.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-lit.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-lit.rs:10:1
2+
--> $DIR/svh-change-lit.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-significant-cfg.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-significant-cfg.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-significant-cfg.rs:10:1
2+
--> $DIR/svh-change-significant-cfg.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-trait-bound.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-trait-bound.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-trait-bound.rs:10:1
2+
--> $DIR/svh-change-trait-bound.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-type-arg.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-type-arg.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-type-arg.rs:10:1
2+
--> $DIR/svh-change-type-arg.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-type-ret.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-type-ret.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-type-ret.rs:10:1
2+
--> $DIR/svh-change-type-ret.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-change-type-static.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-a-base.rs
53
// aux-build:svh-b.rs

src/test/ui/svh/svh-change-type-static.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `a` which `b` depends on
2-
--> $DIR/svh-change-type-static.rs:10:1
2+
--> $DIR/svh-change-type-static.rs:8:1
33
|
44
LL | extern crate b;
55
| ^^^^^^^^^^^^^^^

src/test/ui/svh/svh-use-trait.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-msvc FIXME #31306
2-
31
// note that these aux-build directives must be in this order
42
// aux-build:svh-uta-base.rs
53
// aux-build:svh-utb.rs

src/test/ui/svh/svh-use-trait.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0460]: found possibly newer version of crate `uta` which `utb` depends on
2-
--> $DIR/svh-use-trait.rs:15:1
2+
--> $DIR/svh-use-trait.rs:13:1
33
|
44
LL | extern crate utb;
55
| ^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)