Skip to content

Commit

Permalink
Rollup merge of rust-lang#91411 - ChrisDenton:valid-paths, r=petroche…
Browse files Browse the repository at this point in the history
…nkov

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
  • Loading branch information
matthiaskrgr authored Dec 2, 2021
2 parents d96ce3e + a8e1ac9 commit 822a058
Show file tree
Hide file tree
Showing 16 changed files with 8 additions and 24 deletions.
2 changes: 0 additions & 2 deletions src/test/ui/svh/changing-crates.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:changing-crates-a1.rs
// aux-build:changing-crates-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/changing-crates.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/changing-crates.rs:10:1
--> $DIR/changing-crates.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-lit.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-lit.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-lit.rs:10:1
--> $DIR/svh-change-lit.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-significant-cfg.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-significant-cfg.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-significant-cfg.rs:10:1
--> $DIR/svh-change-significant-cfg.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-trait-bound.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-trait-bound.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-trait-bound.rs:10:1
--> $DIR/svh-change-trait-bound.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-type-arg.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-type-arg.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-type-arg.rs:10:1
--> $DIR/svh-change-type-arg.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-type-ret.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-type-ret.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-type-ret.rs:10:1
--> $DIR/svh-change-type-ret.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-change-type-static.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-a-base.rs
// aux-build:svh-b.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-change-type-static.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `a` which `b` depends on
--> $DIR/svh-change-type-static.rs:10:1
--> $DIR/svh-change-type-static.rs:8:1
|
LL | extern crate b;
| ^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/svh/svh-use-trait.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-msvc FIXME #31306

// note that these aux-build directives must be in this order
// aux-build:svh-uta-base.rs
// aux-build:svh-utb.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/svh/svh-use-trait.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0460]: found possibly newer version of crate `uta` which `utb` depends on
--> $DIR/svh-use-trait.rs:15:1
--> $DIR/svh-use-trait.rs:13:1
|
LL | extern crate utb;
| ^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 822a058

Please sign in to comment.