bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix duplicate bounds for const_trait_impl

Browse source
This commit is contained in:
Deadbeef 2021-09-11 09:40:19 +00:00
parent 497ee321af
commit a0b83f542f
No known key found for this signature in database
GPG key ID: 027DF9338862ADDD
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -1487,10 +1487,11 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
) => false, ) => false,
(ParamCandidate(other), ParamCandidate(victim)) => { (ParamCandidate(other), ParamCandidate(victim)) => {
let value_same_except_bound_vars = other.value.skip_binder() let same_except_bound_vars = other.value.skip_binder()
== victim.value.skip_binder() == victim.value.skip_binder()
&& other.constness == victim.constness
&& !other.value.skip_binder().has_escaping_bound_vars(); && !other.value.skip_binder().has_escaping_bound_vars();
if value_same_except_bound_vars { if same_except_bound_vars {
// See issue #84398. In short, we can generate multiple ParamCandidates which are // 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 // 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 // or the current one if tied (they should both evaluate to the same answer). This is

13
src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
View file

@ -16,12 +16,17 @@ impl const PartialEq for S {
// This duplicate bound should not result in ambiguities. It should be equivalent to a single ~const // This duplicate bound should not result in ambiguities. It should be equivalent to a single ~const
// bound. // bound.
// const fn equals_self<T: PartialEq + ~const PartialEq>(t: &T) -> bool { const fn equals_self<T: PartialEq + ~const PartialEq>(t: &T) -> bool {
// FIXME(fee1-dead)^ why should the order matter here?
const fn equals_self<T: ~const PartialEq + PartialEq>(t: &T) -> bool {
*t == *t *t == *t
} }
pub const EQ: bool = equals_self(&S); trait A: PartialEq {}
impl<T: PartialEq> A for T {}
const fn equals_self2<T: A + ~const PartialEq>(t: &T) -> bool {
*t == *t
}
pub const EQ: bool = equals_self(&S) && equals_self2(&S);
fn main() {} fn main() {}