Skip to content

Commit 686c170

Browse files
authored
Rollup merge of rust-lang#104575 - lcnr:dedup-tests, r=jackh726
deduplicate tests originally added in rust-lang#100514. Using revisions for this reduces the amount of tests in the repo
2 parents 3c6fc06 + 4e504c7 commit 686c170

8 files changed

+9
-39
lines changed

src/test/ui/coherence/issue-100191-2.rs

-12
This file was deleted.

src/test/ui/coherence/issue-100191.rs

-21
This file was deleted.

src/test/ui/specialization/issue-43037.stderr renamed to src/test/ui/specialization/issue-43037.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2-
--> $DIR/issue-43037.rs:17:6
2+
--> $DIR/issue-43037.rs:19:6
33
|
44
LL | impl<T> From<<A<T> as Z>::Assoc> for T {}
55
| ^ type parameter `T` must be used as the type parameter for some local type

src/test/ui/coherence/issue-100191.stderr renamed to src/test/ui/specialization/issue-43037.negative.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2-
--> $DIR/issue-100191.rs:18:6
2+
--> $DIR/issue-43037.rs:19:6
33
|
44
LL | impl<T> From<<A<T> as Z>::Assoc> for T {}
55
| ^ type parameter `T` must be used as the type parameter for some local type

src/test/ui/specialization/issue-43037.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
// revisions: current negative
12
#![feature(specialization)]
3+
#![cfg_attr(negative, feature(with_negative_coherence))]
24
#![allow(incomplete_features)]
35

46
trait X {}

src/test/ui/specialization/issue-45814.stderr renamed to src/test/ui/specialization/issue-45814.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0275]: overflow evaluating the requirement `T: Trait<_>`
22
|
33
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_45814`)
44
note: required for `T` to implement `Trait<_>`
5-
--> $DIR/issue-45814.rs:8:20
5+
--> $DIR/issue-45814.rs:9:20
66
|
77
LL | default impl<T, U> Trait<T> for U {}
88
| ^^^^^^^^ ^

src/test/ui/coherence/issue-100191-2.stderr renamed to src/test/ui/specialization/issue-45814.negative.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0275]: overflow evaluating the requirement `T: Trait<_>`
22
|
3-
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_100191_2`)
3+
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_45814`)
44
note: required for `T` to implement `Trait<_>`
5-
--> $DIR/issue-100191-2.rs:8:20
5+
--> $DIR/issue-45814.rs:9:20
66
|
77
LL | default impl<T, U> Trait<T> for U {}
88
| ^^^^^^^^ ^

src/test/ui/specialization/issue-45814.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//~ ERROR overflow evaluating the requirement `T: Trait<_>`
2-
2+
// revisions: current negative
33
#![feature(specialization)]
4+
#![cfg_attr(negative, feature(with_negative_coherence))]
45
#![allow(incomplete_features)]
56

67
pub trait Trait<T> {}

0 commit comments

Comments
 (0)