@@ -911,7 +911,7 @@ impl<'tcx> TyCtxt<'tcx> {
911911 || self . extern_crate ( key) . is_some_and ( |e| e. is_direct ( ) )
912912 }
913913
914- /// Expand any [weak alias types][weak ] contained within the given `value`.
914+ /// Expand any [free alias types][free ] contained within the given `value`.
915915///
916916/// This should be used over other normalization routines in situations where
917917/// it's important not to normalize other alias types and where the predicates
@@ -926,19 +926,19 @@ impl<'tcx> TyCtxt<'tcx> {
926926/// <div class="warning">
927927/// This delays a bug on overflow! Therefore you need to be certain that the
928928/// contained types get fully normalized at a later stage. Note that even on
929- /// overflow all well-behaved weak alias types get expanded correctly, so the
929+ /// overflow all well-behaved free alias types get expanded correctly, so the
930930/// result is still useful.
931931/// </div>
932932///
933- /// [weak ]: ty::Weak
934- pub fn expand_weak_alias_tys < T : TypeFoldable < TyCtxt < ' tcx > > > ( self , value : T ) -> T {
935- value. fold_with ( & mut WeakAliasTypeExpander { tcx : self , depth : 0 } )
933+ /// [free ]: ty::Free
934+ pub fn expand_free_alias_tys < T : TypeFoldable < TyCtxt < ' tcx > > > ( self , value : T ) -> T {
935+ value. fold_with ( & mut FreeAliasTypeExpander { tcx : self , depth : 0 } )
936936 }
937937
938- /// Peel off all [weak alias types] in this type until there are none left.
938+ /// Peel off all [free alias types] in this type until there are none left.
939939///
940- /// This only expands weak alias types in “head” / outermost positions. It can
941- /// be used over [expand_weak_alias_tys ] as an optimization in situations where
940+ /// This only expands free alias types in “head” / outermost positions. It can
941+ /// be used over [expand_free_alias_tys ] as an optimization in situations where
942942/// one only really cares about the *kind* of the final aliased type but not
943943/// the types the other constituent types alias.
944944///
@@ -947,17 +947,17 @@ impl<'tcx> TyCtxt<'tcx> {
947947/// type gets fully normalized at a later stage.
948948/// </div>
949949///
950- /// [weak ]: ty::Weak
951- /// [expand_weak_alias_tys ]: Self::expand_weak_alias_tys
952- pub fn peel_off_weak_alias_tys ( self , mut ty : Ty < ' tcx > ) -> Ty < ' tcx > {
953- let ty:: Alias ( ty:: Weak , _) = ty. kind ( ) else { return ty } ;
950+ /// [free ]: ty::Free
951+ /// [expand_free_alias_tys ]: Self::expand_free_alias_tys
952+ pub fn peel_off_free_alias_tys ( self , mut ty : Ty < ' tcx > ) -> Ty < ' tcx > {
953+ let ty:: Alias ( ty:: Free , _) = ty. kind ( ) else { return ty } ;
954954
955955 let limit = self . recursion_limit ( ) ;
956956 let mut depth = 0 ;
957957
958- while let ty:: Alias ( ty:: Weak , alias) = ty. kind ( ) {
958+ while let ty:: Alias ( ty:: Free , alias) = ty. kind ( ) {
959959 if !limit. value_within_limit ( depth) {
960- let guar = self . dcx ( ) . delayed_bug ( "overflow expanding weak alias type" ) ;
960+ let guar = self . dcx ( ) . delayed_bug ( "overflow expanding free alias type" ) ;
961961 return Ty :: new_error ( self , guar) ;
962962 }
963963
@@ -985,7 +985,7 @@ impl<'tcx> TyCtxt<'tcx> {
985985 }
986986 ty:: AliasTermKind :: OpaqueTy => Some ( self . variances_of ( def_id) ) ,
987987 ty:: AliasTermKind :: InherentTy
988- | ty:: AliasTermKind :: WeakTy
988+ | ty:: AliasTermKind :: FreeTy
989989 | ty:: AliasTermKind :: UnevaluatedConst
990990 | ty:: AliasTermKind :: ProjectionConst => None ,
991991 }
@@ -1078,25 +1078,25 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for OpaqueTypeExpander<'tcx> {
10781078 }
10791079}
10801080
1081- struct WeakAliasTypeExpander < ' tcx > {
1081+ struct FreeAliasTypeExpander < ' tcx > {
10821082 tcx : TyCtxt < ' tcx > ,
10831083 depth : usize ,
10841084}
10851085
1086- impl < ' tcx > TypeFolder < TyCtxt < ' tcx > > for WeakAliasTypeExpander < ' tcx > {
1086+ impl < ' tcx > TypeFolder < TyCtxt < ' tcx > > for FreeAliasTypeExpander < ' tcx > {
10871087 fn cx ( & self ) -> TyCtxt < ' tcx > {
10881088 self . tcx
10891089 }
10901090
10911091 fn fold_ty ( & mut self , ty : Ty < ' tcx > ) -> Ty < ' tcx > {
1092- if !ty. has_type_flags ( ty:: TypeFlags :: HAS_TY_WEAK ) {
1092+ if !ty. has_type_flags ( ty:: TypeFlags :: HAS_TY_FREE_ALIAS ) {
10931093 return ty;
10941094 }
1095- let ty:: Alias ( ty:: Weak , alias) = ty. kind ( ) else {
1095+ let ty:: Alias ( ty:: Free , alias) = ty. kind ( ) else {
10961096 return ty. super_fold_with ( self ) ;
10971097 } ;
10981098 if !self . tcx . recursion_limit ( ) . value_within_limit ( self . depth ) {
1099- let guar = self . tcx . dcx ( ) . delayed_bug ( "overflow expanding weak alias type" ) ;
1099+ let guar = self . tcx . dcx ( ) . delayed_bug ( "overflow expanding free alias type" ) ;
11001100 return Ty :: new_error ( self . tcx , guar) ;
11011101 }
11021102
@@ -1107,7 +1107,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for WeakAliasTypeExpander<'tcx> {
11071107 }
11081108
11091109 fn fold_const ( & mut self , ct : ty:: Const < ' tcx > ) -> ty:: Const < ' tcx > {
1110- if !ct. has_type_flags ( ty:: TypeFlags :: HAS_TY_WEAK ) {
1110+ if !ct. has_type_flags ( ty:: TypeFlags :: HAS_TY_FREE_ALIAS ) {
11111111 return ct;
11121112 }
11131113 ct. super_fold_with ( self )
0 commit comments