Skip to content

Commit e866f8a

Browse files
compiler-errorscompiler-errors
committed
Revert 'Stabilize -Znext-solver=coherence'
1 parent 5bce6d4 commit e866f8a

File tree

104 files changed

+578
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+578
-392
lines changed

‎compiler/rustc_interface/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ fn test_unstable_options_tracking_hash() {
808808
tracked!(mir_opt_level, Some(4));
809809
tracked!(move_size_limit, Some(4096));
810810
tracked!(mutable_noalias, false);
811-
tracked!(next_solver, NextSolverConfig { coherence: true, globally: true });
811+
tracked!(next_solver, Some(NextSolverConfig { coherence: true, globally: false }));
812812
tracked!(no_generate_arange_section, true);
813813
tracked!(no_jump_tables, true);
814814
tracked!(no_link, true);

‎compiler/rustc_middle/src/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3132,11 +3132,11 @@ impl<'tcx> TyCtxt<'tcx> {
31323132
}
31333133

31343134
pub fn next_trait_solver_globally(self) -> bool {
3135-
self.sess.opts.unstable_opts.next_solver.globally
3135+
self.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.globally)
31363136
}
31373137

31383138
pub fn next_trait_solver_in_coherence(self) -> bool {
3139-
self.sess.opts.unstable_opts.next_solver.coherence
3139+
self.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.coherence)
31403140
}
31413141

31423142
pub fn is_impl_trait_in_trait(self, def_id: DefId) -> bool {

‎compiler/rustc_session/src/config.rs

-5
Original file line numberDiff line numberDiff line change
@@ -842,11 +842,6 @@ pub struct NextSolverConfig {
842842
/// This is only `true` if `coherence` is also enabled.
843843
pub globally: bool,
844844
}
845-
impl Default for NextSolverConfig {
846-
fn default() -> Self {
847-
NextSolverConfig { coherence: true, globally: false }
848-
}
849-
}
850845

851846
#[derive(Clone)]
852847
pub enum Input {

‎compiler/rustc_session/src/options.rs

+21-10
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ mod desc {
403403
pub(crate) const parse_unpretty: &str = "`string` or `string=string`";
404404
pub(crate) const parse_treat_err_as_bug: &str = "either no value or a non-negative number";
405405
pub(crate) const parse_next_solver_config: &str =
406-
"either `globally` (when used without an argument), `coherence` (default) or `no`";
406+
"a comma separated list of solver configurations: `globally` (default), and `coherence`";
407407
pub(crate) const parse_lto: &str =
408408
"either a boolean (`yes`, `no`, `on`, `off`, etc), `thin`, `fat`, or omitted";
409409
pub(crate) const parse_linker_plugin_lto: &str =
@@ -1105,16 +1105,27 @@ mod parse {
11051105
}
11061106
}
11071107

1108-
pub(crate) fn parse_next_solver_config(slot: &mut NextSolverConfig, v: Option<&str>) -> bool {
1108+
pub(crate) fn parse_next_solver_config(
1109+
slot: &mut Option<NextSolverConfig>,
1110+
v: Option<&str>,
1111+
) -> bool {
11091112
if let Some(config) = v {
1110-
*slot = match config {
1111-
"no" => NextSolverConfig { coherence: false, globally: false },
1112-
"coherence" => NextSolverConfig { coherence: true, globally: false },
1113-
"globally" => NextSolverConfig { coherence: true, globally: true },
1114-
_ => return false,
1115-
};
1113+
let mut coherence = false;
1114+
let mut globally = true;
1115+
for c in config.split(',') {
1116+
match c {
1117+
"globally" => globally = true,
1118+
"coherence" => {
1119+
globally = false;
1120+
coherence = true;
1121+
}
1122+
_ => return false,
1123+
}
1124+
}
1125+
1126+
*slot = Some(NextSolverConfig { coherence: coherence || globally, globally });
11161127
} else {
1117-
*slot = NextSolverConfig { coherence: true, globally: true };
1128+
*slot = Some(NextSolverConfig { coherence: true, globally: true });
11181129
}
11191130

11201131
true
@@ -1867,7 +1878,7 @@ options! {
18671878
"the size at which the `large_assignments` lint starts to be emitted"),
18681879
mutable_noalias: bool = (true, parse_bool, [TRACKED],
18691880
"emit noalias metadata for mutable references (default: yes)"),
1870-
next_solver: NextSolverConfig = (NextSolverConfig::default(), parse_next_solver_config, [TRACKED],
1881+
next_solver: Option<NextSolverConfig> = (None, parse_next_solver_config, [TRACKED],
18711882
"enable and configure the next generation trait solver used by rustc"),
18721883
nll_facts: bool = (false, parse_bool, [UNTRACKED],
18731884
"dump facts from NLL analysis into side files (default: no)"),

‎compiler/rustc_trait_selection/src/traits/engine.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ where
3535
if infcx.next_trait_solver() {
3636
Box::new(NextFulfillmentCtxt::new(infcx))
3737
} else {
38+
let new_solver_globally =
39+
infcx.tcx.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.globally);
3840
assert!(
39-
!infcx.tcx.next_trait_solver_globally(),
41+
!new_solver_globally,
4042
"using old solver even though new solver is enabled globally"
4143
);
4244
Box::new(FulfillmentContext::new(infcx))

‎tests/ui/specialization/coherence/default-impl-normalization-ambig-2.rs ‎tests/crashes/118987-2.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// regression test for #118987
1+
//@ known-bug: #118987
22
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
33

44
trait Assoc {
@@ -15,5 +15,3 @@ trait Foo {}
1515

1616
impl Foo for <u8 as Assoc>::Output {}
1717
impl Foo for <u16 as Assoc>::Output {}
18-
//~^ ERROR the trait bound `u16: Assoc` is not satisfied
19-
fn main() {}

‎tests/crashes/118987.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//@ known-bug: #118987
2+
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
3+
4+
trait Assoc {
5+
type Output;
6+
}
7+
8+
default impl<T: Clone> Assoc for T {
9+
type Output = bool;
10+
}
11+
12+
impl Assoc for u8 {}
13+
14+
trait Foo {}
15+
16+
impl Foo for <u8 as Assoc>::Output {}
17+
impl Foo for <u16 as Assoc>::Output {}

‎tests/ui/transmutability/malformed-program-gracefulness/coherence-bikeshed-intrinsic-from.rs ‎tests/crashes/124207.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
//@ known-bug: #124207
12
#![feature(transmutability)]
23
#![feature(type_alias_impl_trait)]
34
trait OpaqueTrait {}
45
type OpaqueType = impl OpaqueTrait;
5-
//~^ ERROR unconstrained opaque type
66
trait AnotherTrait {}
77
impl<T: std::mem::TransmuteFrom<(), ()>> AnotherTrait for T {}
8-
//~^ ERROR type provided when a constant was expected
98
impl AnotherTrait for OpaqueType {}
10-
//~^ ERROR conflicting implementations of trait `AnotherTrait`
119
pub fn main() {}

‎tests/ui/specialization/coherence/default-item-normalization-ambig-1.rs ‎tests/crashes/74299.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// regression test for #73299.
2-
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
1+
//@ known-bug: #74299
2+
#![feature(specialization)]
33

44
trait X {
55
type U;
@@ -18,7 +18,6 @@ trait Y {
1818

1919
impl Y for <() as X>::U {}
2020
impl Y for <i32 as X>::U {}
21-
//~^ ERROR conflicting implementations of trait `Y` for type `<() as X>::U`
2221

2322
fn main() {
2423
().f().g();

‎tests/ui/associated-types/associated-types-coherence-failure.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
1+
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `Cow<'_, _>`
22
--> $DIR/associated-types-coherence-failure.rs:21:1
33
|
44
LL | impl<'a, B: ?Sized> IntoCow<'a, B> for <B as ToOwned>::Owned where B: ToOwned {
55
| ----------------------------------------------------------------------------- first implementation here
66
...
77
LL | impl<'a, B: ?Sized> IntoCow<'a, B> for Cow<'a, B> where B: ToOwned {
8-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Cow<'_, _>`
99

10-
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
10+
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `&_`
1111
--> $DIR/associated-types-coherence-failure.rs:28:1
1212
|
1313
LL | impl<'a, B: ?Sized> IntoCow<'a, B> for <B as ToOwned>::Owned where B: ToOwned {
1414
| ----------------------------------------------------------------------------- first implementation here
1515
...
1616
LL | impl<'a, B: ?Sized> IntoCow<'a, B> for &'a B where B: ToOwned {
17-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_`
1818

1919
error: aborting due to 2 previous errors
2020

‎tests/ui/auto-traits/opaque_type_candidate_selection.rs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//! used to ICE: #119272
2+
3+
//@ check-pass
4+
5+
#![feature(type_alias_impl_trait)]
6+
mod defining_scope {
7+
use super::*;
8+
pub type Alias<T> = impl Sized;
9+
10+
pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
11+
x
12+
}
13+
}
14+
15+
struct Container<T: Trait<U>, U> {
16+
x: <T as Trait<U>>::Assoc,
17+
}
18+
19+
trait Trait<T> {
20+
type Assoc;
21+
}
22+
23+
impl<T> Trait<T> for T {
24+
type Assoc = Box<u32>;
25+
}
26+
impl<T> Trait<T> for defining_scope::Alias<T> {
27+
type Assoc = usize;
28+
}
29+
30+
fn main() {}

‎tests/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ LL | impl<'a, T: MyPredicate<'a>> MyTrait<'a> for T {}
55
| ---------------------------------------------- first implementation here
66
LL | impl<'a, T> MyTrait<'a> for &'a T {}
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_`
8-
|
9-
= note: downstream crates may implement trait `MyPredicate<'_>` for type `&_`
108

119
error: aborting due to 1 previous error
1210

‎tests/ui/coherence/coherence-negative-outlives-lifetimes.with_negative_coherence.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ LL | impl<'a, T: MyPredicate<'a>> MyTrait<'a> for T {}
55
| ---------------------------------------------- first implementation here
66
LL | impl<'a, T> MyTrait<'a> for &'a T {}
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_`
8-
|
9-
= note: downstream crates may implement trait `MyPredicate<'_>` for type `&_`
108

119
error: aborting due to 1 previous error
1210

‎tests/ui/coherence/coherence-overlap-downstream-inherent.stderr ‎tests/ui/coherence/coherence-overlap-downstream-inherent.next.stderr

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

1010
error[E0592]: duplicate definitions with name `f`
11-
--> $DIR/coherence-overlap-downstream-inherent.rs:13:38
11+
--> $DIR/coherence-overlap-downstream-inherent.rs:16:38
1212
|
1313
LL | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
1414
| ^^^^^^^^^^^ duplicate definitions for `f`

‎tests/ui/coherence/coherence-overlap-downstream-inherent.old.stderr

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
error[E0592]: duplicate definitions with name `dummy`
2+
--> $DIR/coherence-overlap-downstream-inherent.rs:10:26
3+
|
4+
LL | impl<T:Sugar> Sweet<T> { fn dummy(&self) { } }
5+
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`
6+
LL |
7+
LL | impl<T:Fruit> Sweet<T> { fn dummy(&self) { } }
8+
| --------------- other definition for `dummy`
9+
10+
error[E0592]: duplicate definitions with name `f`
11+
--> $DIR/coherence-overlap-downstream-inherent.rs:16:38
12+
|
13+
LL | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
14+
| ^^^^^^^^^^^ duplicate definitions for `f`
15+
LL |
16+
LL | impl<X> A<i32, X> { fn f(&self) {} }
17+
| ----------- other definition for `f`
18+
|
19+
= note: downstream crates may implement trait `Bar<_>` for type `i32`
20+
21+
error: aborting due to 2 previous errors
22+
23+
For more information about this error, try `rustc --explain E0592`.

‎tests/ui/coherence/coherence-overlap-downstream-inherent.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ revisions: old next
2+
//@[next] compile-flags: -Znext-solver
3+
14
// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
25
// though no impls are found.
36

‎tests/ui/coherence/coherence-overlap-downstream.stderr ‎tests/ui/coherence/coherence-overlap-downstream.next.stderr

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

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

‎tests/ui/coherence/coherence-overlap-downstream.old.stderr

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
error[E0119]: conflicting implementations of trait `Sweet`
2+
--> $DIR/coherence-overlap-downstream.rs:11:1
3+
|
4+
LL | impl<T:Sugar> Sweet for T { }
5+
| ------------------------- first implementation here
6+
LL | impl<T:Fruit> Sweet for T { }
7+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
8+
9+
error[E0119]: conflicting implementations of trait `Foo<_>` for type `i32`
10+
--> $DIR/coherence-overlap-downstream.rs:17:1
11+
|
12+
LL | impl<X, T> Foo<X> for T where T: Bar<X> {}
13+
| --------------------------------------- first implementation here
14+
LL | impl<X> Foo<X> for i32 {}
15+
| ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
16+
|
17+
= note: downstream crates may implement trait `Bar<_>` for type `i32`
18+
19+
error: aborting due to 2 previous errors
20+
21+
For more information about this error, try `rustc --explain E0119`.

‎tests/ui/coherence/coherence-overlap-downstream.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ revisions: old next
2+
//@[next] compile-flags: -Znext-solver
3+
14
// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
25
// though no impls are found.
36

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr ‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0592]: duplicate definitions with name `dummy`
2-
--> $DIR/coherence-overlap-issue-23516-inherent.rs:9:25
2+
--> $DIR/coherence-overlap-issue-23516-inherent.rs:12:25
33
|
44
LL | impl<T:Sugar> Cake<T> { fn dummy(&self) { } }
55
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.old.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0592]: duplicate definitions with name `dummy`
2+
--> $DIR/coherence-overlap-issue-23516-inherent.rs:12:25
3+
|
4+
LL | impl<T:Sugar> Cake<T> { fn dummy(&self) { } }
5+
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`
6+
LL |
7+
LL | impl<U:Sugar> Cake<Box<U>> { fn dummy(&self) { } }
8+
| --------------- other definition for `dummy`
9+
|
10+
= note: downstream crates may implement trait `Sugar` for type `std::boxed::Box<_>`
11+
12+
error: aborting due to 1 previous error
13+
14+
For more information about this error, try `rustc --explain E0592`.

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ revisions: old next
2+
//@[next] compile-flags: -Znext-solver
3+
14
// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
25
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
36
// error is reported for the following pair of impls (#23516).

‎tests/ui/coherence/coherence-overlap-issue-23516.stderr ‎tests/ui/coherence/coherence-overlap-issue-23516.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Sweet` for type `Box<_>`
2-
--> $DIR/coherence-overlap-issue-23516.rs:8:1
2+
--> $DIR/coherence-overlap-issue-23516.rs:11:1
33
|
44
LL | impl<T:Sugar> Sweet for T { }
55
| ------------------------- first implementation here

‎tests/ui/coherence/coherence-overlap-issue-23516.old.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error[E0119]: conflicting implementations of trait `Sweet` for type `Box<_>`
2+
--> $DIR/coherence-overlap-issue-23516.rs:11:1
3+
|
4+
LL | impl<T:Sugar> Sweet for T { }
5+
| ------------------------- first implementation here
6+
LL | impl<U:Sugar> Sweet for Box<U> { }
7+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Box<_>`
8+
|
9+
= note: downstream crates may implement trait `Sugar` for type `std::boxed::Box<_>`
10+
11+
error: aborting due to 1 previous error
12+
13+
For more information about this error, try `rustc --explain E0119`.

‎tests/ui/coherence/coherence-overlap-issue-23516.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ revisions: old next
2+
//@[next] compile-flags: -Znext-solver
3+
14
// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
25
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
36
// error is reported for the following pair of impls (#23516).

‎tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ LL | impl<T: DerefMut> Foo for T {}
55
| --------------------------- first implementation here
66
LL | impl<U> Foo for &U {}
77
| ^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_`
8-
|
9-
= note: downstream crates may implement trait `std::ops::DerefMut` for type `&_`
108

119
error: aborting due to 1 previous error
1210

0 commit comments

Comments
 (0)