@@ -266,7 +266,7 @@ object Types {
266266 }
267267
268268 /** Is this type exactly Nothing (no vars, aliases, refinements etc allowed)? */
269- def isNothingType (using Context ): Boolean = this match {
269+ def isNothing (using Context ): Boolean = this match {
270270 case tp : TypeRef =>
271271 tp.name == tpnme.Nothing && (tp.symbol eq defn.NothingClass )
272272 case _ => false
@@ -2126,7 +2126,7 @@ object Types {
21262126 case arg : TypeBounds =>
21272127 val v = param.paramVarianceSign
21282128 val pbounds = param.paramInfo
2129- if (v > 0 && pbounds.loBound.dealiasKeepAnnots.isNothingType ) TypeAlias (arg.hiBound & rebase(pbounds.hiBound))
2129+ if (v > 0 && pbounds.loBound.dealiasKeepAnnots.isNothing ) TypeAlias (arg.hiBound & rebase(pbounds.hiBound))
21302130 else if (v < 0 && pbounds.hiBound.dealiasKeepAnnots.isTopType) TypeAlias (arg.loBound | rebase(pbounds.loBound))
21312131 else arg recoverable_& rebase(pbounds)
21322132 case arg => TypeAlias (arg)
@@ -2289,7 +2289,7 @@ object Types {
22892289 if (base.isAnd == variance >= 0 ) tp1 & tp2 else tp1 | tp2
22902290 case _ =>
22912291 if (pre.termSymbol.is(Package )) argForParam(pre.select(nme.PACKAGE ))
2292- else if (pre.isNothingType ) pre
2292+ else if (pre.isNothing ) pre
22932293 else NoType
22942294 }
22952295 }
@@ -2308,7 +2308,7 @@ object Types {
23082308 */
23092309 def derivedSelect (prefix : Type )(using Context ): Type =
23102310 if (prefix eq this .prefix) this
2311- else if (prefix.isNothingType ) prefix
2311+ else if (prefix.isNothing ) prefix
23122312 else {
23132313 if (isType) {
23142314 val res =
@@ -4292,7 +4292,7 @@ object Types {
42924292
42934293 /** For uninstantiated type variables: Is the lower bound different from Nothing? */
42944294 def hasLowerBound (using Context ): Boolean =
4295- ! ctx.typerState.constraint.entry(origin).loBound.isNothingType
4295+ ! ctx.typerState.constraint.entry(origin).loBound.isNothing
42964296
42974297 /** For uninstantiated type variables: Is the upper bound different from Any? */
42984298 def hasUpperBound (using Context ): Boolean =
@@ -5297,7 +5297,7 @@ object Types {
52975297 case _ =>
52985298 def propagate (lo : Type , hi : Type ) =
52995299 range(derivedRefinedType(tp, parent, lo), derivedRefinedType(tp, parent, hi))
5300- if (parent.isNothingType ) parent
5300+ if (parent.isNothing ) parent
53015301 else info match {
53025302 case Range (infoLo : TypeBounds , infoHi : TypeBounds ) =>
53035303 assert(variance == 0 )
@@ -5390,7 +5390,7 @@ object Types {
53905390 case Range (lo, hi) =>
53915391 range(tp.derivedAnnotatedType(lo, annot), tp.derivedAnnotatedType(hi, annot))
53925392 case _ =>
5393- if (underlying.isNothingType ) underlying
5393+ if (underlying.isNothing ) underlying
53945394 else tp.derivedAnnotatedType(underlying, annot)
53955395 }
53965396 override protected def derivedWildcardType (tp : WildcardType , bounds : Type ): WildcardType =
@@ -5638,7 +5638,7 @@ object Types {
56385638 else {
56395639 seen += tp
56405640 tp match {
5641- case tp if tp.isTopType || tp.isNothingType =>
5641+ case tp if tp.isTopType || tp.isNothing =>
56425642 cs
56435643 case tp : AppliedType =>
56445644 foldOver(cs + tp.typeSymbol, tp)
0 commit comments