Skip to content

Commit

Permalink
remove unnecessary revisions
Browse files Browse the repository at this point in the history
lcnr committed Oct 15, 2024
1 parent d3f982d commit 7aeb07a
Showing 43 changed files with 30 additions and 281 deletions.

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/coherence-overlap-downstream-inherent.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ revisions: old next
//@[next] compile-flags: -Znext-solver

// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
// though no impls are found.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0592]: duplicate definitions with name `dummy`
--> $DIR/coherence-overlap-downstream-inherent.rs:10:26
--> $DIR/coherence-overlap-downstream-inherent.rs:7:26
|
LL | impl<T:Sugar> Sweet<T> { fn dummy(&self) { } }
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`
@@ -8,7 +8,7 @@ LL | impl<T:Fruit> Sweet<T> { fn dummy(&self) { } }
| --------------- other definition for `dummy`

error[E0592]: duplicate definitions with name `f`
--> $DIR/coherence-overlap-downstream-inherent.rs:16:38
--> $DIR/coherence-overlap-downstream-inherent.rs:13:38
|
LL | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
| ^^^^^^^^^^^ duplicate definitions for `f`
21 changes: 0 additions & 21 deletions tests/ui/coherence/coherence-overlap-downstream.old.stderr

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/coherence-overlap-downstream.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ revisions: old next
//@[next] compile-flags: -Znext-solver

// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
// though no impls are found.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
error[E0119]: conflicting implementations of trait `Sweet`
--> $DIR/coherence-overlap-downstream.rs:11:1
--> $DIR/coherence-overlap-downstream.rs:8:1
|
LL | impl<T:Sugar> Sweet for T { }
| ------------------------- first implementation here
LL | impl<T:Fruit> Sweet for T { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation

error[E0119]: conflicting implementations of trait `Foo<_>` for type `i32`
--> $DIR/coherence-overlap-downstream.rs:17:1
--> $DIR/coherence-overlap-downstream.rs:14:1
|
LL | impl<X, T> Foo<X> for T where T: Bar<X> {}
| --------------------------------------- first implementation here

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ revisions: old next
//@[next] compile-flags: -Znext-solver

// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
// error is reported for the following pair of impls (#23516).
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0592]: duplicate definitions with name `dummy`
--> $DIR/coherence-overlap-issue-23516-inherent.rs:12:25
--> $DIR/coherence-overlap-issue-23516-inherent.rs:9:25
|
LL | impl<T:Sugar> Cake<T> { fn dummy(&self) { } }
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`
13 changes: 0 additions & 13 deletions tests/ui/coherence/coherence-overlap-issue-23516.old.stderr

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/coherence-overlap-issue-23516.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ revisions: old next
//@[next] compile-flags: -Znext-solver

// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
// error is reported for the following pair of impls (#23516).
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Sweet` for type `Box<_>`
--> $DIR/coherence-overlap-issue-23516.rs:11:1
--> $DIR/coherence-overlap-issue-23516.rs:8:1
|
LL | impl<T:Sugar> Sweet for T { }
| ------------------------- first implementation here

This file was deleted.

Original file line number Diff line number Diff line change
@@ -2,9 +2,6 @@
// "Coherence incorrectly considers `unnormalizable_projection: Trait` to not hold even if it could"
#![crate_type = "lib"]

//@ revisions: classic next
//@[next] compile-flags: -Znext-solver

trait WhereBound {}
impl WhereBound for () {}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Trait` for type `Box<_>`
--> $DIR/coherence-overlap-unnormalizable-projection-0.rs:27:1
--> $DIR/coherence-overlap-unnormalizable-projection-0.rs:24:1
|
LL | / impl<T> Trait for T
LL | | where

This file was deleted.

Original file line number Diff line number Diff line change
@@ -2,9 +2,6 @@
// "Coherence incorrectly considers `unnormalizable_projection: Trait` to not hold even if it could"
#![crate_type = "lib"]

//@ revisions: classic next
//@[next] compile-flags: -Znext-solver

pub trait WhereBound {}
impl WhereBound for () {}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Trait` for type `Box<_>`
--> $DIR/coherence-overlap-unnormalizable-projection-1.rs:26:1
--> $DIR/coherence-overlap-unnormalizable-projection-1.rs:23:1
|
LL | / impl<T> Trait for T
LL | | where
2 changes: 0 additions & 2 deletions tests/ui/coherence/coherent-due-to-fulfill.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//@ compile-flags: -Znext-solver=coherence
//@ check-pass

trait Mirror {
type Assoc;
}
2 changes: 0 additions & 2 deletions tests/ui/coherence/incoherent-even-though-we-fulfill.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//@ compile-flags: -Znext-solver=coherence

trait Mirror {
type Assoc;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Foo` for type `()`
--> $DIR/incoherent-even-though-we-fulfill.rs:17:1
--> $DIR/incoherent-even-though-we-fulfill.rs:15:1
|
LL | impl<T> Foo for T where (): Mirror<Assoc = T> {}
| --------------------------------------------- first implementation here
17 changes: 0 additions & 17 deletions tests/ui/coherence/inter-crate-ambiguity-causes-notes.old.stderr

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ revisions: old next
//@[next] compile-flags: -Znext-solver

struct S;

impl From<()> for S {
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `From<()>` for type `S`
--> $DIR/inter-crate-ambiguity-causes-notes.rs:12:1
--> $DIR/inter-crate-ambiguity-causes-notes.rs:9:1
|
LL | impl From<()> for S {
| ------------------- first implementation here
15 changes: 0 additions & 15 deletions tests/ui/coherence/normalize-for-errors.current.stderr

This file was deleted.

15 changes: 0 additions & 15 deletions tests/ui/coherence/normalize-for-errors.next.stderr

This file was deleted.

4 changes: 2 additions & 2 deletions tests/ui/coherence/occurs-check/associated-type.next.stderr
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
error[E0119]: conflicting implementations of trait `Overlap<for<'a> fn(&'a (), ())>` for type `for<'a> fn(&'a (), ())`
--> $DIR/associated-type.rs:31:1
--> $DIR/associated-type.rs:32:1
|
LL | impl<T> Overlap<T> for T {
| ------------------------ first implementation here
@@ -17,7 +17,7 @@ LL | | for<'a> *const T: ToUnit<'a>,
= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details

error[E0284]: type annotations needed: cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
--> $DIR/associated-type.rs:44:59
--> $DIR/associated-type.rs:45:59
|
LL | foo::<for<'a> fn(&'a (), ()), for<'a> fn(&'a (), ())>(3usize);
| ^^^^^^ cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
2 changes: 1 addition & 1 deletion tests/ui/coherence/occurs-check/associated-type.old.stderr
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
error[E0119]: conflicting implementations of trait `Overlap<for<'a> fn(&'a (), ())>` for type `for<'a> fn(&'a (), ())`
--> $DIR/associated-type.rs:31:1
--> $DIR/associated-type.rs:32:1
|
LL | impl<T> Overlap<T> for T {
| ------------------------ first implementation here
1 change: 1 addition & 0 deletions tests/ui/coherence/occurs-check/associated-type.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//@ revisions: old next
//@ ignore-compare-mode-next-solver (explicit revisions)
//@[next] compile-flags: -Znext-solver

// A (partial) regression test for #105787
2 changes: 1 addition & 1 deletion tests/ui/coherence/occurs-check/opaques.current.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Trait<_>`
--> $DIR/opaques.rs:27:1
--> $DIR/opaques.rs:28:1
|
LL | impl<T> Trait<T> for T {
| ---------------------- first implementation here
4 changes: 2 additions & 2 deletions tests/ui/coherence/occurs-check/opaques.next.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `Trait<_>`
--> $DIR/opaques.rs:27:1
--> $DIR/opaques.rs:28:1
|
LL | impl<T> Trait<T> for T {
| ---------------------- first implementation here
@@ -8,7 +8,7 @@ LL | impl<T> Trait<T> for defining_scope::Alias<T> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation

error[E0282]: type annotations needed
--> $DIR/opaques.rs:10:23
--> $DIR/opaques.rs:11:23
|
LL | pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
| ^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
3 changes: 2 additions & 1 deletion tests/ui/coherence/occurs-check/opaques.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//@revisions: current next
//@ revisions: current next
//@ ignore-compare-mode-next-solver (explicit revisions)
//@[next] compile-flags: -Znext-solver

// A regression test for #105787

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/orphan-check-opaque-types-not-covering.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Opaque types never cover type parameters.

//@ revisions: classic next
//@[next] compile-flags: -Znext-solver

//@ aux-crate:foreign=parametrized-trait.rs
//@ edition:2021

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0210]: type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
--> $DIR/orphan-check-opaque-types-not-covering.rs:17:6
--> $DIR/orphan-check-opaque-types-not-covering.rs:14:6
|
LL | impl<T> foreign::Trait0<Local, T, ()> for Identity<T> {}
| ^ type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
@@ -8,7 +8,7 @@ LL | impl<T> foreign::Trait0<Local, T, ()> for Identity<T> {}
= note: in this case, 'before' refers to the following order: `impl<..> ForeignTrait<T1, ..., Tn> for T0`, where `T0` is the first and `Tn` is the last

error[E0210]: type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
--> $DIR/orphan-check-opaque-types-not-covering.rs:26:6
--> $DIR/orphan-check-opaque-types-not-covering.rs:23:6
|
LL | impl<T> foreign::Trait1<Local, T> for Opaque<T> {}
| ^ type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
3 changes: 0 additions & 3 deletions tests/ui/coherence/orphan-check-projections-covering.rs
Original file line number Diff line number Diff line change
@@ -5,9 +5,6 @@
// first which would've lead to real-word regressions.

//@ check-pass
//@ revisions: classic next
//@[next] compile-flags: -Znext-solver

//@ aux-crate:foreign=parametrized-trait.rs
//@ edition:2021

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/orphan-check-weak-aliases-not-covering.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Weak aliases might not cover type parameters.

//@ revisions: classic next
//@[next] compile-flags: -Znext-solver

//@ aux-crate:foreign=parametrized-trait.rs
//@ edition:2021

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0210]: type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
--> $DIR/orphan-check-weak-aliases-not-covering.rs:16:6
--> $DIR/orphan-check-weak-aliases-not-covering.rs:13:6
|
LL | impl<T> foreign::Trait1<Local, T> for Identity<T> {}
| ^ type parameter `T` must be covered by another type when it appears before the first local type (`Local`)
14 changes: 0 additions & 14 deletions tests/ui/coherence/skip-reporting-if-references-err.current.stderr

This file was deleted.

14 changes: 0 additions & 14 deletions tests/ui/coherence/skip-reporting-if-references-err.next.stderr

This file was deleted.

3 changes: 0 additions & 3 deletions tests/ui/coherence/super-traits/super-trait-knowable-2.rs
Original file line number Diff line number Diff line change
@@ -9,9 +9,6 @@
// which caused the old solver to emit a `Tensor: TensorValue` goal in
// `fn normalize_to_error` which then failed, causing this test to pass.

//@ revisions: current next
//@ ignore-compare-mode-next-solver (explicit revisions)
//@[next] compile-flags: -Znext-solver
//@ check-pass

pub trait TensorValue {
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
error: unconstrained opaque type
--> $DIR/coherence-bikeshed-intrinsic-from.rs:4:19
|
LL | type OpaqueType = impl OpaqueTrait;
| ^^^^^^^^^^^^^^^^
|
= note: `OpaqueType` must be used in combination with a concrete type within the same module

error[E0747]: type provided when a constant was expected
--> $DIR/coherence-bikeshed-intrinsic-from.rs:7:37
|
@@ -21,6 +13,14 @@ LL |
LL | impl AnotherTrait for OpaqueType {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation

error: unconstrained opaque type
--> $DIR/coherence-bikeshed-intrinsic-from.rs:4:19
|
LL | type OpaqueType = impl OpaqueTrait;
| ^^^^^^^^^^^^^^^^
|
= note: `OpaqueType` must be used in combination with a concrete type within the same module

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0119, E0747.

0 comments on commit 7aeb07a

Please sign in to comment.