Skip to content

Commit 8824d60

Browse files
committed
stabilize -Znext-solver=coherence
1 parent c416a6f commit 8824d60

File tree

63 files changed

+327
-317
lines changed

Some content is hidden

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

63 files changed

+327
-317
lines changed

compiler/rustc_middle/src/ty/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,11 +3127,11 @@ impl<'tcx> TyCtxt<'tcx> {
31273127
}
31283128

31293129
pub fn next_trait_solver_globally(self) -> bool {
3130-
self.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.globally)
3130+
self.sess.opts.unstable_opts.next_solver.globally
31313131
}
31323132

31333133
pub fn next_trait_solver_in_coherence(self) -> bool {
3134-
self.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.coherence)
3134+
self.sess.opts.unstable_opts.next_solver.coherence
31353135
}
31363136

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

compiler/rustc_session/src/config.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,11 @@ pub struct NextSolverConfig {
823823
/// This is only `true` if `coherence` is also enabled.
824824
pub globally: bool,
825825
}
826+
impl Default for NextSolverConfig {
827+
fn default() -> Self {
828+
NextSolverConfig { coherence: true, globally: false }
829+
}
830+
}
826831

827832
#[derive(Clone)]
828833
pub enum Input {

compiler/rustc_session/src/options.rs

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ mod desc {
402402
pub const parse_unpretty: &str = "`string` or `string=string`";
403403
pub const parse_treat_err_as_bug: &str = "either no value or a non-negative number";
404404
pub const parse_next_solver_config: &str =
405-
"a comma separated list of solver configurations: `globally` (default), and `coherence`";
405+
"either `globally` (when used without an argument), `coherence` (default) or `no`";
406406
pub const parse_lto: &str =
407407
"either a boolean (`yes`, `no`, `on`, `off`, etc), `thin`, `fat`, or omitted";
408408
pub const parse_linker_plugin_lto: &str =
@@ -1088,27 +1088,16 @@ mod parse {
10881088
}
10891089
}
10901090

1091-
pub(crate) fn parse_next_solver_config(
1092-
slot: &mut Option<NextSolverConfig>,
1093-
v: Option<&str>,
1094-
) -> bool {
1091+
pub(crate) fn parse_next_solver_config(slot: &mut NextSolverConfig, v: Option<&str>) -> bool {
10951092
if let Some(config) = v {
1096-
let mut coherence = false;
1097-
let mut globally = true;
1098-
for c in config.split(',') {
1099-
match c {
1100-
"globally" => globally = true,
1101-
"coherence" => {
1102-
globally = false;
1103-
coherence = true;
1104-
}
1105-
_ => return false,
1106-
}
1107-
}
1108-
1109-
*slot = Some(NextSolverConfig { coherence: coherence || globally, globally });
1093+
*slot = match config {
1094+
"no" => NextSolverConfig { coherence: false, globally: false },
1095+
"coherence" => NextSolverConfig { coherence: true, globally: false },
1096+
"globally" => NextSolverConfig { coherence: true, globally: true },
1097+
_ => return false,
1098+
};
11101099
} else {
1111-
*slot = Some(NextSolverConfig { coherence: true, globally: true });
1100+
*slot = NextSolverConfig { coherence: true, globally: true };
11121101
}
11131102

11141103
true
@@ -1842,7 +1831,7 @@ options! {
18421831
"the size at which the `large_assignments` lint starts to be emitted"),
18431832
mutable_noalias: bool = (true, parse_bool, [TRACKED],
18441833
"emit noalias metadata for mutable references (default: yes)"),
1845-
next_solver: Option<NextSolverConfig> = (None, parse_next_solver_config, [TRACKED],
1834+
next_solver: NextSolverConfig = (NextSolverConfig::default(), parse_next_solver_config, [TRACKED],
18461835
"enable and configure the next generation trait solver used by rustc"),
18471836
nll_facts: bool = (false, parse_bool, [UNTRACKED],
18481837
"dump facts from NLL analysis into side files (default: no)"),

compiler/rustc_trait_selection/src/traits/engine.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ 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);
4038
assert!(
41-
!new_solver_globally,
39+
!infcx.tcx.next_trait_solver_globally(),
4240
"using old solver even though new solver is enabled globally"
4341
);
4442
Box::new(FulfillmentContext::new(infcx))

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `Cow<'_, _>`
1+
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
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 `Cow<'_, _>`
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
99

10-
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `&_`
10+
error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
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 `&_`
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
1818

1919
error: aborting due to 2 previous errors
2020

tests/ui/auto-traits/opaque_type_candidate_selection.rs

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ 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 `&_`
810

911
error: aborting due to 1 previous error
1012

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ 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 `&_`
810

911
error: aborting due to 1 previous error
1012

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ 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 `&_`
810

911
error: aborting due to 1 previous error
1012

tests/ui/coherence/coherence-overlap-unnormalizable-projection-0.classic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ LL | impl<T> Trait for Box<T> {}
1212
| ^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Box<_>`
1313
|
1414
= note: downstream crates may implement trait `WithAssoc<'a>` for type `std::boxed::Box<_>`
15-
= note: downstream crates may implement trait `WhereBound` for type `<std::boxed::Box<_> as WithAssoc<'a>>::Assoc`
1615

1716
error: aborting due to 1 previous error
1817

0 commit comments

Comments
 (0)