mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 07:14:28 +00:00
Auto merge of #84559 - jackh726:issue-84398, r=nikomatsakis
Deduplicate ParamCandidates with the same value except for bound vars Fixes #84398 This is kind of a hack. I wonder if we can get other types of candidates that are the same except for bound vars. This won't be a problem with Chalk, since we don't really need to know that there are two different "candidates" if they both give the same final substitution. r? `@nikomatsakis`
This commit is contained in:
commit
377d1a984c
@ -1361,7 +1361,17 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
||||
) => false,
|
||||
|
||||
(ParamCandidate(other), ParamCandidate(victim)) => {
|
||||
if other.value == victim.value && victim.constness == Constness::NotConst {
|
||||
let value_same_except_bound_vars = other.value.skip_binder()
|
||||
== victim.value.skip_binder()
|
||||
&& !other.value.skip_binder().has_escaping_bound_vars();
|
||||
if value_same_except_bound_vars {
|
||||
// See issue #84398. In short, we can generate multiple ParamCandidates which are
|
||||
// the same except for unused bound vars. Just pick the one with the fewest bound vars
|
||||
// or the current one if tied (they should both evaluate to the same answer). This is
|
||||
// probably best characterized as a "hack", since we might prefer to just do our
|
||||
// best to *not* create essentially duplicate candidates in the first place.
|
||||
other.value.bound_vars().len() <= victim.value.bound_vars().len()
|
||||
} else if other.value == victim.value && victim.constness == Constness::NotConst {
|
||||
// Drop otherwise equivalent non-const candidates in favor of const candidates.
|
||||
true
|
||||
} else {
|
||||
|
20
src/test/ui/lifetimes/issue-84398.rs
Normal file
20
src/test/ui/lifetimes/issue-84398.rs
Normal file
@ -0,0 +1,20 @@
|
||||
// check-pass
|
||||
|
||||
pub trait Deserialize<'de>: Sized {}
|
||||
pub trait DeserializeOwned: for<'de> Deserialize<'de> {}
|
||||
|
||||
pub trait Extensible {
|
||||
type Config;
|
||||
}
|
||||
|
||||
// The `C` here generates a `C: Sized` candidate
|
||||
pub trait Installer<C> {
|
||||
fn init<B: Extensible<Config = C>>(&mut self) -> ()
|
||||
where
|
||||
// This clause generates a `for<'de> C: Sized` candidate
|
||||
B::Config: DeserializeOwned,
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user