Skip to content

Commit 9a0f289

Browse files
tiiftiif
committed
Add Symbol to UnstableFeature ClauseKind
1 parent 52120c8 commit 9a0f289

File tree

26 files changed

+38
-30
lines changed

26 files changed

+38
-30
lines changed

‎compiler/rustc_hir_analysis/src/collect/predicates_of.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ pub(super) fn assert_only_contains_predicates_from<'tcx>(
747747
ty::ClauseKind::RegionOutlives(_)
748748
| ty::ClauseKind::ConstArgHasType(_, _)
749749
| ty::ClauseKind::WellFormed(_)
750-
| ty::ClauseKind::UnstableFeature
750+
| ty::ClauseKind::UnstableFeature(_)
751751
| ty::ClauseKind::ConstEvaluatable(_) => {
752752
bug!(
753753
"unexpected non-`Self` predicate when computing \
@@ -775,7 +775,7 @@ pub(super) fn assert_only_contains_predicates_from<'tcx>(
775775
| ty::ClauseKind::ConstArgHasType(_, _)
776776
| ty::ClauseKind::WellFormed(_)
777777
| ty::ClauseKind::ConstEvaluatable(_)
778-
| ty::ClauseKind::UnstableFeature
778+
| ty::ClauseKind::UnstableFeature(_)
779779
| ty::ClauseKind::HostEffect(..) => {
780780
bug!(
781781
"unexpected non-`Self` predicate when computing \

‎compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ fn trait_specialization_kind<'tcx>(
499499
| ty::ClauseKind::ConstArgHasType(..)
500500
| ty::ClauseKind::WellFormed(_)
501501
| ty::ClauseKind::ConstEvaluatable(..)
502-
| ty::ClauseKind::UnstableFeature
502+
| ty::ClauseKind::UnstableFeature(_)
503503
| ty::ClauseKind::HostEffect(..) => None,
504504
}
505505
}

‎compiler/rustc_hir_analysis/src/outlives/explicit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<'tcx> ExplicitPredicatesMap<'tcx> {
5454
| ty::ClauseKind::ConstArgHasType(_, _)
5555
| ty::ClauseKind::WellFormed(_)
5656
| ty::ClauseKind::ConstEvaluatable(_)
57-
| ty::ClauseKind::UnstableFeature
57+
| ty::ClauseKind::UnstableFeature(_)
5858
| ty::ClauseKind::HostEffect(..) => {}
5959
}
6060
}

‎compiler/rustc_hir_typeck/src/fn_ctxt/inspect_obligations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
5353
| ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(..))
5454
| ty::PredicateKind::ConstEquate(..)
5555
| ty::PredicateKind::Clause(ty::ClauseKind::HostEffect(..))
56-
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature)
56+
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_))
5757
| ty::PredicateKind::Ambiguous => false,
5858
}
5959
}

‎compiler/rustc_hir_typeck/src/method/probe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
926926
| ty::ClauseKind::ConstArgHasType(_, _)
927927
| ty::ClauseKind::WellFormed(_)
928928
| ty::ClauseKind::ConstEvaluatable(_)
929-
| ty::ClauseKind::UnstableFeature
929+
| ty::ClauseKind::UnstableFeature(_)
930930
| ty::ClauseKind::HostEffect(..) => None,
931931
}
932932
});

‎compiler/rustc_lint/src/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ impl<'tcx> LateLintPass<'tcx> for TrivialConstraints {
15681568
ClauseKind::TypeOutlives(..) |
15691569
ClauseKind::RegionOutlives(..) => "lifetime",
15701570

1571-
ClauseKind::UnstableFeature
1571+
ClauseKind::UnstableFeature(_)
15721572
// `ConstArgHasType` is never global as `ct` is always a param
15731573
| ClauseKind::ConstArgHasType(..)
15741574
// Ignore projections, as they can only be global

‎compiler/rustc_middle/src/ty/context.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
129129
type FnInputTys = &'tcx [Ty<'tcx>];
130130
type ParamTy = ParamTy;
131131
type BoundTy = ty::BoundTy;
132+
type Symbol = Symbol;
132133

133134
type PlaceholderTy = ty::PlaceholderType;
134135
type ErrorGuaranteed = ErrorGuaranteed;

‎compiler/rustc_middle/src/ty/flags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ impl FlagComputation {
309309
ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(arg)) => {
310310
self.add_args(slice::from_ref(&arg));
311311
}
312-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => {}
312+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => {}
313313
ty::PredicateKind::DynCompatible(_def_id) => {}
314314
ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(uv)) => {
315315
self.add_const(uv);

‎compiler/rustc_middle/src/ty/predicate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl<'tcx> Predicate<'tcx> {
131131
| PredicateKind::Clause(ClauseKind::TypeOutlives(_))
132132
| PredicateKind::Clause(ClauseKind::Projection(_))
133133
| PredicateKind::Clause(ClauseKind::ConstArgHasType(..))
134-
| PredicateKind::Clause(ClauseKind::UnstableFeature)
134+
| PredicateKind::Clause(ClauseKind::UnstableFeature(_))
135135
| PredicateKind::DynCompatible(_)
136136
| PredicateKind::Subtype(_)
137137
| PredicateKind::Coerce(_)
@@ -648,7 +648,7 @@ impl<'tcx> Predicate<'tcx> {
648648
PredicateKind::Clause(ClauseKind::Projection(..))
649649
| PredicateKind::Clause(ClauseKind::HostEffect(..))
650650
| PredicateKind::Clause(ClauseKind::ConstArgHasType(..))
651-
| PredicateKind::Clause(ClauseKind::UnstableFeature)
651+
| PredicateKind::Clause(ClauseKind::UnstableFeature(_))
652652
| PredicateKind::NormalizesTo(..)
653653
| PredicateKind::AliasRelate(..)
654654
| PredicateKind::Subtype(..)
@@ -670,7 +670,7 @@ impl<'tcx> Predicate<'tcx> {
670670
PredicateKind::Clause(ClauseKind::Trait(..))
671671
| PredicateKind::Clause(ClauseKind::HostEffect(..))
672672
| PredicateKind::Clause(ClauseKind::ConstArgHasType(..))
673-
| PredicateKind::Clause(ClauseKind::UnstableFeature)
673+
| PredicateKind::Clause(ClauseKind::UnstableFeature(_))
674674
| PredicateKind::NormalizesTo(..)
675675
| PredicateKind::AliasRelate(..)
676676
| PredicateKind::Subtype(..)

‎compiler/rustc_middle/src/ty/print/pretty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3250,7 +3250,7 @@ define_print! {
32503250
ty::ClauseKind::ConstEvaluatable(ct) => {
32513251
p!("the constant `", print(ct), "` can be evaluated")
32523252
}
3253-
ty::ClauseKind::UnstableFeature => p!("unstable impl"),
3253+
ty::ClauseKind::UnstableFeature(_) => p!("unstable impl"), // TODO: fix this later
32543254
}
32553255
}
32563256

‎compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ where
528528
ty::PredicateKind::Clause(ty::ClauseKind::ConstArgHasType(ct, ty)) => {
529529
self.compute_const_arg_has_type_goal(Goal { param_env, predicate: (ct, ty) })
530530
}
531-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => todo!(),
531+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => todo!(),
532532
ty::PredicateKind::Subtype(predicate) => {
533533
self.compute_subtype_goal(Goal { param_env, predicate })
534534
}

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,14 @@ where
155155
ty.visit_with(self)
156156
}
157157
ty::ClauseKind::ConstEvaluatable(ct) => ct.visit_with(self),
158+
<<<<<<< HEAD
158159
ty::ClauseKind::WellFormed(term) => term.visit_with(self),
159160
ty::ClauseKind::UnstableImpl => todo!(), // TODO: maybe we need a visit with function here too?leFeature => todo!(), // TODO: maybe we need a visit with function here too?
160161

162+
=======
163+
ty::ClauseKind::WellFormed(arg) => arg.visit_with(self),
164+
ty::ClauseKind::UnstableFeature(_) => todo!(), // TODO: maybe we need a visit with function here too?
165+
>>>>>>> 4df12515651 (Add Symbol to UnstableFeature ClauseKind)
161166
}
162167
}
163168

‎compiler/rustc_smir/src/rustc_smir/convert/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ impl<'tcx> Stable<'tcx> for ty::ClauseKind<'tcx> {
648648
ClauseKind::HostEffect(..) => {
649649
todo!()
650650
}
651-
ClauseKind::UnstableFeature => {
651+
ClauseKind::UnstableFeature(_) => {
652652
todo!()
653653
}
654654
}

‎compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
639639
}
640640
}
641641

642-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => todo!(), // TODO: is this for error reporting?
642+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => todo!(), // TODO: is this for error reporting?
643643

644644
// Errors for `ConstEvaluatable` predicates show up as
645645
// `SelectionError::ConstEvalFailure`,

‎compiler/rustc_trait_selection/src/traits/auto_trait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
798798
// FIXME(generic_const_exprs): you can absolutely add this as a where clauses
799799
| ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(..))
800800
| ty::PredicateKind::Coerce(..)
801-
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature)
801+
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_))
802802
| ty::PredicateKind::Clause(ty::ClauseKind::HostEffect(..)) => {}
803803
ty::PredicateKind::Ambiguous => return false,
804804
};

‎compiler/rustc_trait_selection/src/traits/dyn_compatibility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ fn predicate_references_self<'tcx>(
238238
// FIXME(generic_const_exprs): this can mention `Self`
239239
| ty::ClauseKind::ConstEvaluatable(..)
240240
| ty::ClauseKind::HostEffect(..)
241-
| ty::ClauseKind::UnstableFeature
241+
| ty::ClauseKind::UnstableFeature(_)
242242
=> None,
243243
}
244244
}
@@ -279,7 +279,7 @@ fn generics_require_sized_self(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
279279
| ty::ClauseKind::ConstArgHasType(_, _)
280280
| ty::ClauseKind::WellFormed(_)
281281
| ty::ClauseKind::ConstEvaluatable(_)
282-
| ty::ClauseKind::UnstableFeature
282+
| ty::ClauseKind::UnstableFeature(_)
283283
| ty::ClauseKind::HostEffect(..) => false,
284284
})
285285
}

‎compiler/rustc_trait_selection/src/traits/fulfill.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ impl<'a, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'tcx> {
404404
ty::PredicateKind::AliasRelate(..) => {
405405
bug!("AliasRelate is only used by the new solver")
406406
}
407-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => todo!(), // TODO: not sure what will happen here.
407+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => todo!(), // TODO: not sure what will happen here.
408408
},
409409
Some(pred) => match pred {
410410
ty::PredicateKind::Clause(ty::ClauseKind::Trait(data)) => {
@@ -762,7 +762,7 @@ impl<'a, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'tcx> {
762762
}
763763
}
764764
}
765-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => todo!(),
765+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => todo!(),
766766
},
767767
}
768768
}

‎compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub fn compute_implied_outlives_bounds_inner<'tcx>(
110110
| ty::PredicateKind::ConstEquate(..)
111111
| ty::PredicateKind::Ambiguous
112112
| ty::PredicateKind::NormalizesTo(..)
113-
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature)
113+
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_))
114114
| ty::PredicateKind::AliasRelate(..) => {}
115115

116116
// We need to search through *all* WellFormed predicates

‎compiler/rustc_trait_selection/src/traits/select/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
838838
}
839839
}
840840

841-
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature) => todo!(),
841+
ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_)) => todo!(),
842842

843843
ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(uv)) => {
844844
match const_evaluatable::is_const_evaluatable(

‎compiler/rustc_trait_selection/src/traits/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub fn expand_trait_aliases<'tcx>(
7676
| ty::ClauseKind::ConstArgHasType(_, _)
7777
| ty::ClauseKind::WellFormed(_)
7878
| ty::ClauseKind::ConstEvaluatable(_)
79-
| ty::ClauseKind::UnstableFeature
79+
| ty::ClauseKind::UnstableFeature(_)
8080
| ty::ClauseKind::HostEffect(..) => {}
8181
}
8282
}

‎compiler/rustc_trait_selection/src/traits/wf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ pub fn clause_obligations<'tcx>(
197197
ty::ClauseKind::ConstEvaluatable(ct) => {
198198
wf.add_wf_preds_for_term(ct.into());
199199
}
200-
ty::ClauseKind::UnstableFeature => {}
200+
ty::ClauseKind::UnstableFeature(_) => {}
201201
}
202202

203203
wf.normalize(infcx)
@@ -1088,7 +1088,7 @@ pub fn object_region_bounds<'tcx>(
10881088
| ty::ClauseKind::Projection(_)
10891089
| ty::ClauseKind::ConstArgHasType(_, _)
10901090
| ty::ClauseKind::WellFormed(_)
1091-
| ty::ClauseKind::UnstableFeature
1091+
| ty::ClauseKind::UnstableFeature(_)
10921092
| ty::ClauseKind::ConstEvaluatable(_) => None,
10931093
}
10941094
})

‎compiler/rustc_traits/src/normalize_erasing_regions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn not_outlives_predicate(p: ty::Predicate<'_>) -> bool {
5757
| ty::PredicateKind::Clause(ty::ClauseKind::Projection(..))
5858
| ty::PredicateKind::Clause(ty::ClauseKind::HostEffect(..))
5959
| ty::PredicateKind::Clause(ty::ClauseKind::ConstArgHasType(..))
60-
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature)
60+
| ty::PredicateKind::Clause(ty::ClauseKind::UnstableFeature(_))
6161
| ty::PredicateKind::NormalizesTo(..)
6262
| ty::PredicateKind::AliasRelate(..)
6363
| ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(..))

‎compiler/rustc_type_ir/src/elaborate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl<I: Interner, O: Elaboratable<I>> Elaborator<I, O> {
200200
ty::ClauseKind::ConstArgHasType(..) => {
201201
// Nothing to elaborate
202202
}
203-
ty::ClauseKind::UnstableFeature => {
203+
ty::ClauseKind::UnstableFeature(_) => {
204204
// TODO: come back later and add more stuff if needed.
205205
}
206206
}

‎compiler/rustc_type_ir/src/interner.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ pub trait Interner:
100100
type ParamTy: Copy + Debug + Hash + Eq + ParamLike;
101101
type BoundTy: Copy + Debug + Hash + Eq + BoundVarLike<Self>;
102102
type PlaceholderTy: PlaceholderLike;
103+
type Symbol: Copy + Hash + PartialEq + Eq + TypeFoldable<Self> + TypeVisitable<Self>; // TODO: add more trait if we need it, keep it minimal for now.
103104

104105
// Things stored inside of tys
105106
type ErrorGuaranteed: Copy + Debug + Hash + Eq;

‎compiler/rustc_type_ir/src/predicate_kind.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::fmt;
22

3+
34
use derive_where::derive_where;
45
#[cfg(feature = "nightly")]
56
use rustc_macros::{Decodable_NoContext, Encodable_NoContext, HashStable_NoContext};
@@ -48,7 +49,7 @@ pub enum ClauseKind<I: Interner> {
4849
HostEffect(ty::HostEffectPredicate<I>),
4950

5051
/// Support marking impl as unstable.
51-
UnstableFeature,
52+
UnstableFeature(I::Symbol),
5253
}
5354

5455
#[derive_where(Clone, Copy, Hash, PartialEq, Eq; I: Interner)]
@@ -137,7 +138,7 @@ impl<I: Interner> fmt::Debug for ClauseKind<I> {
137138
ClauseKind::ConstEvaluatable(ct) => {
138139
write!(f, "ConstEvaluatable({ct:?})")
139140
}
140-
ClauseKind::UnstableFeature => write!(f, "UnstableFeature"),
141+
ClauseKind::UnstableFeature(feature_name) => write!(f, "UnstableFeature({feature_name:?})"),
141142
}
142143
}
143144
}

‎src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ pub(crate) fn clean_predicate<'tcx>(
398398
| ty::ClauseKind::ConstArgHasType(..)
399399
// FIXME(const_trait_impl): We can probably use this `HostEffect` pred to render `~const`.
400400
| ty::ClauseKind::HostEffect(_) => None,
401-
ty::ClauseKind::UnstableFeature => todo!(),
401+
ty::ClauseKind::UnstableFeature(_) => todo!(),
402402
}
403403
}
404404

0 commit comments

Comments
 (0)