Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_next_trait_solver/src/solve/effect_goals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ where

ecx.probe_builtin_trait_candidate(BuiltinImplSource::Misc).enter(|ecx| {
ecx.add_goals(
GoalSource::AliasBoundConstCondition,
GoalSource::ImplWhereBound,
const_conditions.into_iter().map(|trait_ref| {
goal.with(
cx,
Expand Down
11 changes: 4 additions & 7 deletions compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,10 @@ enum CurrentGoalKind {
impl CurrentGoalKind {
fn from_query_input<I: Interner>(cx: I, input: QueryInput<I, I::Predicate>) -> CurrentGoalKind {
match input.goal.predicate.kind().skip_binder() {
ty::PredicateKind::Clause(ty::ClauseKind::Trait(pred)) => {
if cx.trait_is_coinductive(pred.trait_ref.def_id) {
CurrentGoalKind::CoinductiveTrait
} else {
CurrentGoalKind::Misc
}
}
ty::PredicateKind::Clause(
ty::ClauseKind::Trait(ty::TraitClause { trait_ref, .. })
| ty::ClauseKind::HostEffect(ty::HostEffectClause { trait_ref, .. }),
) if cx.trait_is_coinductive(trait_ref.def_id) => CurrentGoalKind::CoinductiveTrait,
ty::PredicateKind::NormalizesTo(_) => {
CurrentGoalKind::ProjectionComputeAssocTermCandidate
}
Expand Down
1 change: 1 addition & 0 deletions library/core/src/marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,7 @@ marker_impls! {
#[diagnostic::on_unimplemented(message = "can't drop `{Self}`")]
#[rustc_deny_explicit_impl]
#[rustc_dyn_incompatible_trait]
#[rustc_coinductive]
pub const trait Destruct: PointeeSized {}

/// A marker for tuple types.
Expand Down
22 changes: 22 additions & 0 deletions tests/ui/consts/const_destruct_coinduction.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//@ check-pass
//@ compile-flags: -Znext-solver

#![feature(const_trait_impl)]
#![feature(const_destruct)]

use std::marker::Destruct;

struct Wrap<T>(*const T);

const impl<T: [const] Destruct> Drop for Wrap<T> {
fn drop(&mut self) {}
}

enum Foo {
A,
B(Wrap<Self>),
}

const fn drop_foo(_: Foo) {}

fn main() {}
Loading