Skip to content

Commit

Permalink
Deduplicate ParamCandidates with the same value except for bound vars
Browse files Browse the repository at this point in the history
  • Loading branch information
jackh726 committed Apr 25, 2021
1 parent 58bdb08 commit 9f06939
Showing 2 changed files with 31 additions and 1 deletion.
12 changes: 11 additions & 1 deletion compiler/rustc_trait_selection/src/traits/select/mod.rs
Original file line number Diff line number Diff line change
@@ -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 current one (the 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.
true
} else if other.value == victim.value && victim.constness == Constness::NotConst {
// Drop otherwise equivalent non-const candidates in favor of const candidates.
true
} else {
20 changes: 20 additions & 0 deletions src/test/ui/lifetimes/issue-84398.rs
Original file line number Diff line number Diff line change
@@ -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() {}

0 comments on commit 9f06939

Please sign in to comment.