bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename InternedObligationCauseCode.

Browse source 
It's a misleading name, because it's not interned.
This commit is contained in:
Nicholas Nethercote 2025-02-06 16:33:55 +11:00
parent 0895fe20e2
commit c2dba9ce78
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/rustc_middle/src/traits/mod.rs
View file

@ -51,7 +51,7 @@ pub struct ObligationCause<'tcx> {
/// information. /// information.
pub body_id: LocalDefId, pub body_id: LocalDefId,
code: InternedObligationCauseCode<'tcx>, code: ObligationCauseCodeHandle<'tcx>,
} }
// This custom hash function speeds up hashing for `Obligation` deduplication // This custom hash function speeds up hashing for `Obligation` deduplication
@ -97,7 +97,7 @@ impl<'tcx> ObligationCause<'tcx> {
pub fn map_code( pub fn map_code(
&mut self, &mut self,
f: impl FnOnce(InternedObligationCauseCode<'tcx>) -> ObligationCauseCode<'tcx>, f: impl FnOnce(ObligationCauseCodeHandle<'tcx>) -> ObligationCauseCode<'tcx>,
) { ) {
self.code = f(std::mem::take(&mut self.code)).into(); self.code = f(std::mem::take(&mut self.code)).into();
} }
@ -152,15 +152,16 @@ pub struct UnifyReceiverContext<'tcx> {
pub args: GenericArgsRef<'tcx>, pub args: GenericArgsRef<'tcx>,
} }
/// A compact form of `ObligationCauseCode`.
#[derive(Clone, PartialEq, Eq, Default, HashStable)] #[derive(Clone, PartialEq, Eq, Default, HashStable)]
#[derive(TypeVisitable, TypeFoldable, TyEncodable, TyDecodable)] #[derive(TypeVisitable, TypeFoldable, TyEncodable, TyDecodable)]
pub struct InternedObligationCauseCode<'tcx> { pub struct ObligationCauseCodeHandle<'tcx> {
/// `None` for `ObligationCauseCode::Misc` (a common case, occurs ~60% of /// `None` for `ObligationCauseCode::Misc` (a common case, occurs ~60% of
/// the time). `Some` otherwise. /// the time). `Some` otherwise.
code: Option<Arc<ObligationCauseCode<'tcx>>>, code: Option<Arc<ObligationCauseCode<'tcx>>>,
} }
impl<'tcx> std::fmt::Debug for InternedObligationCauseCode<'tcx> { impl<'tcx> std::fmt::Debug for ObligationCauseCodeHandle<'tcx> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let cause: &ObligationCauseCode<'_> = self; let cause: &ObligationCauseCode<'_> = self;
cause.fmt(f) cause.fmt(f)
@ -169,14 +170,14 @@ impl<'tcx> std::fmt::Debug for InternedObligationCauseCode<'tcx> {
impl<'tcx> ObligationCauseCode<'tcx> { impl<'tcx> ObligationCauseCode<'tcx> {
#[inline(always)] #[inline(always)]
fn into(self) -> InternedObligationCauseCode<'tcx> { fn into(self) -> ObligationCauseCodeHandle<'tcx> {
InternedObligationCauseCode { ObligationCauseCodeHandle {
code: if let ObligationCauseCode::Misc = self { None } else { Some(Arc::new(self)) }, code: if let ObligationCauseCode::Misc = self { None } else { Some(Arc::new(self)) },
} }
} }
} }
impl<'tcx> std::ops::Deref for InternedObligationCauseCode<'tcx> { impl<'tcx> std::ops::Deref for ObligationCauseCodeHandle<'tcx> {
type Target = ObligationCauseCode<'tcx>; type Target = ObligationCauseCode<'tcx>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
@ -305,7 +306,7 @@ pub enum ObligationCauseCode<'tcx> {
/// The node of the function call. /// The node of the function call.
call_hir_id: HirId, call_hir_id: HirId,
/// The obligation introduced by this argument. /// The obligation introduced by this argument.
parent_code: InternedObligationCauseCode<'tcx>, parent_code: ObligationCauseCodeHandle<'tcx>,
}, },
/// Error derived when checking an impl item is compatible with /// Error derived when checking an impl item is compatible with
@ -390,7 +391,8 @@ pub enum ObligationCauseCode<'tcx> {
/// `WellFormed(None)`. /// `WellFormed(None)`.
WellFormed(Option<WellFormedLoc>), WellFormed(Option<WellFormedLoc>),
/// From `match_impl`. The cause for us having to match an impl, and the DefId we are matching against. /// From `match_impl`. The cause for us having to match an impl, and the DefId we are matching
/// against.
MatchImpl(ObligationCause<'tcx>, DefId), MatchImpl(ObligationCause<'tcx>, DefId),
BinOp { BinOp {
@ -413,7 +415,7 @@ pub enum ObligationCauseCode<'tcx> {
ConstParam(Ty<'tcx>), ConstParam(Ty<'tcx>),
/// Obligations emitted during the normalization of a weak type alias. /// Obligations emitted during the normalization of a weak type alias.
TypeAlias(InternedObligationCauseCode<'tcx>, Span, DefId), TypeAlias(ObligationCauseCodeHandle<'tcx>, Span, DefId),
} }
/// Whether a value can be extracted into a const. /// Whether a value can be extracted into a const.
@ -578,7 +580,7 @@ pub struct DerivedCause<'tcx> {
pub parent_trait_pred: ty::PolyTraitPredicate<'tcx>, pub parent_trait_pred: ty::PolyTraitPredicate<'tcx>,
/// The parent trait had this cause. /// The parent trait had this cause.
pub parent_code: InternedObligationCauseCode<'tcx>, pub parent_code: ObligationCauseCodeHandle<'tcx>,
} }
#[derive(Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)] #[derive(Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]
@ -586,9 +588,9 @@ pub struct DerivedCause<'tcx> {
pub struct ImplDerivedCause<'tcx> { pub struct ImplDerivedCause<'tcx> {
pub derived: DerivedCause<'tcx>, pub derived: DerivedCause<'tcx>,
/// The `DefId` of the `impl` that gave rise to the `derived` obligation. /// The `DefId` of the `impl` that gave rise to the `derived` obligation.
/// If the `derived` obligation arose from a trait alias, which conceptually has a synthetic impl, /// If the `derived` obligation arose from a trait alias, which conceptually has a synthetic
/// then this will be the `DefId` of that trait alias. Care should therefore be taken to handle /// impl, then this will be the `DefId` of that trait alias. Care should therefore be taken to
/// that exceptional case where appropriate. /// handle that exceptional case where appropriate.
pub impl_or_alias_def_id: DefId, pub impl_or_alias_def_id: DefId,
/// The index of the derived predicate in the parent impl's predicates. /// The index of the derived predicate in the parent impl's predicates.
pub impl_def_predicate_index: Option<usize>, pub impl_def_predicate_index: Option<usize>,
@ -605,7 +607,7 @@ pub struct DerivedHostCause<'tcx> {
pub parent_host_pred: ty::Binder<'tcx, ty::HostEffectPredicate<'tcx>>, pub parent_host_pred: ty::Binder<'tcx, ty::HostEffectPredicate<'tcx>>,
/// The parent trait had this cause. /// The parent trait had this cause.
pub parent_code: InternedObligationCauseCode<'tcx>, pub parent_code: ObligationCauseCodeHandle<'tcx>,
} }
#[derive(Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)] #[derive(Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]