bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tidy up

Browse source
This commit is contained in:
Deadbeef 2022-03-21 17:07:09 +11:00
parent 1f3ee7f32e
commit fe5b81348f
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_trait_selection/src/traits/select/confirmation.rs
View file

@ -1051,8 +1051,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
#[cfg(bootstrap)] #[cfg(bootstrap)]
{} {}
if obligation.predicate.skip_binder().def_id() == drop_trait if obligation.predicate.skip_binder().def_id() == drop_trait {
{
return Ok(ImplSourceConstDestructData { nested: vec![] }); return Ok(ImplSourceConstDestructData { nested: vec![] });
} }
@ -1068,7 +1067,10 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
if let Some(impl_def_id) = impl_def_id { if let Some(impl_def_id) = impl_def_id {
let obligations = self.infcx.commit_unconditionally(|_| { let obligations = self.infcx.commit_unconditionally(|_| {
let mut new_obligation = obligation.clone(); let mut new_obligation = obligation.clone();
new_obligation.predicate = new_obligation.predicate.map_bound(|mut trait_pred| { trait_pred.trait_ref.def_id = drop_trait; trait_pred }); new_obligation.predicate = new_obligation.predicate.map_bound(|mut trait_pred| {
trait_pred.trait_ref.def_id = drop_trait;
trait_pred
});
let substs = self.rematch_impl(impl_def_id, &new_obligation); let substs = self.rematch_impl(impl_def_id, &new_obligation);
debug!(?substs, "impl substs"); debug!(?substs, "impl substs");
let cause = obligation.derived_cause(ImplDerivedObligation); let cause = obligation.derived_cause(ImplDerivedObligation);
@ -1140,7 +1142,9 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
self_ty self_ty
.rebind(ty::TraitPredicate { .rebind(ty::TraitPredicate {
trait_ref: ty::TraitRef { trait_ref: ty::TraitRef {
def_id: self.tcx().require_lang_item(LangItem::Destruct, None), def_id: self
.tcx()
.require_lang_item(LangItem::Destruct, None),
substs: self.tcx().mk_substs_trait(nested_ty, &[]), substs: self.tcx().mk_substs_trait(nested_ty, &[]),
}, },
constness: ty::BoundConstness::ConstIfConst, constness: ty::BoundConstness::ConstIfConst,

6
src/test/ui/rfc-2632-const-trait-impl/const-drop-bound.rs
View file

@ -14,7 +14,11 @@ const fn foo<T, E>(res: Result<T, E>) -> Option<T> where E: ~const Destruct {
pub struct Foo<T>(T); pub struct Foo<T>(T);
const fn baz<T: ~const Destruct, E: ~const Destruct>(res: Result<Foo<T>, Foo<E>>) -> Option<Foo<T>> { const fn baz<T, E>(res: Result<Foo<T>, Foo<E>>) -> Option<Foo<T>>
where
T: ~const Destruct,
E: ~const Destruct,
{
foo(res) foo(res)
} }