mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add impl polarity to fields

Browse Source
This commit is contained in:
Deadbeef 2021-11-24 16:07:38 +08:00
parent b2005117bc
commit 4f29f3cef8
No known key found for this signature in database
GPG Key ID: 027DF9338862ADDD
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
View File

@ -284,32 +284,32 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// structs and enums. // structs and enums.
self.assemble_candidates_from_impls(obligation, &mut candidates); self.assemble_candidates_from_impls(obligation, &mut candidates);
// For other types, we'll use the builtin rules. // For other types, we'll use the builtin rules.
let copy_conditions = self.copy_clone_conditions(obligation); let copy_conditions = self.copy_clone_conditions(obligation);
self.assemble_builtin_bound_candidates(copy_conditions, &mut candidates); self.assemble_builtin_bound_candidates(copy_conditions, &mut candidates);
} else if lang_items.discriminant_kind_trait() == Some(def_id) { } else if lang_items.discriminant_kind_trait() == Some(def_id) {
// `DiscriminantKind` is automatically implemented for every type. // `DiscriminantKind` is automatically implemented for every type.
candidates.vec.push(DiscriminantKindCandidate); candidates.vec.push(DiscriminantKindCandidate);
} else if lang_items.pointee_trait() == Some(def_id) { } else if lang_items.pointee_trait() == Some(def_id) {
// `Pointee` is automatically implemented for every type. // `Pointee` is automatically implemented for every type.
candidates.vec.push(PointeeCandidate); candidates.vec.push(PointeeCandidate);
} else if lang_items.sized_trait() == Some(def_id) { } else if lang_items.sized_trait() == Some(def_id) {
// Sized is never implementable by end-users, it is // Sized is never implementable by end-users, it is
// always automatically computed. // always automatically computed.
let sized_conditions = self.sized_conditions(obligation); let sized_conditions = self.sized_conditions(obligation);
self.assemble_builtin_bound_candidates(sized_conditions, &mut candidates); self.assemble_builtin_bound_candidates(sized_conditions, &mut candidates);
} else if lang_items.unsize_trait() == Some(def_id) { } else if lang_items.unsize_trait() == Some(def_id) {
self.assemble_candidates_for_unsizing(obligation, &mut candidates); self.assemble_candidates_for_unsizing(obligation, &mut candidates);
} else if lang_items.drop_trait() == Some(def_id) } else if lang_items.drop_trait() == Some(def_id)
&& obligation.predicate.skip_binder().constness == ty::BoundConstness::ConstIfConst && obligation.predicate.skip_binder().constness == ty::BoundConstness::ConstIfConst
{ {
if self.is_in_const_context { if self.is_in_const_context {
self.assemble_const_drop_candidates(obligation, stack, &mut candidates)?; self.assemble_const_drop_candidates(obligation, stack, &mut candidates)?;
} else { } else {
debug!("passing ~const Drop bound; in non-const context"); debug!("passing ~const Drop bound; in non-const context");
// `~const Drop` when we are not in a const context has no effect. // `~const Drop` when we are not in a const context has no effect.
candidates.vec.push(ConstDropCandidate) candidates.vec.push(ConstDropCandidate)
} }
} else { } else {
if lang_items.clone_trait() == Some(def_id) { if lang_items.clone_trait() == Some(def_id) {
// Same builtin conditions as `Copy`, i.e., every type which has builtin support // Same builtin conditions as `Copy`, i.e., every type which has builtin support
@ -947,6 +947,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
substs: self.tcx().mk_substs_trait(ty, &[]), substs: self.tcx().mk_substs_trait(ty, &[]),
}, },
constness: ty::BoundConstness::ConstIfConst, constness: ty::BoundConstness::ConstIfConst,
polarity: ty::ImplPolarity::Positive,
})); }));
let const_drop_stack = self.push_stack(obligation_stack.list(), &const_drop_obligation); let const_drop_stack = self.push_stack(obligation_stack.list(), &const_drop_obligation);