Skip to content

Commit 7deb2b0

Browse files
committed
use named arg for nestedInOwner
1 parent 21e90e2 commit 7deb2b0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ class CheckCaptures extends Recheck, SymTransformer:
212212
report.error(i"$header included in allowed capture set ${res.blocking}", pos)
213213

214214
/** The current environment */
215-
private var curEnv: Env = Env(NoSymbol, false, CaptureSet.empty, isBoxed = false, null)
215+
private var curEnv: Env = Env(NoSymbol, nestedInOwner = false, CaptureSet.empty, isBoxed = false, null)
216216

217217
private val myCapturedVars: util.EqHashMap[Symbol, CaptureSet] = EqHashMap()
218218

@@ -451,7 +451,7 @@ class CheckCaptures extends Recheck, SymTransformer:
451451
if !Synthetics.isExcluded(sym) then
452452
val saved = curEnv
453453
val localSet = capturedVars(sym)
454-
if !localSet.isAlwaysEmpty then curEnv = Env(sym, false, localSet, isBoxed = false, curEnv)
454+
if !localSet.isAlwaysEmpty then curEnv = Env(sym, nestedInOwner = false, localSet, isBoxed = false, curEnv)
455455
try super.recheckDefDef(tree, sym)
456456
finally
457457
interpolateVarsIn(tree.tpt)
@@ -467,7 +467,7 @@ class CheckCaptures extends Recheck, SymTransformer:
467467
val localSet = capturedVars(cls)
468468
for parent <- impl.parents do // (1)
469469
checkSubset(capturedVars(parent.tpe.classSymbol), localSet, parent.srcPos)
470-
if !localSet.isAlwaysEmpty then curEnv = Env(cls, false, localSet, isBoxed = false, curEnv)
470+
if !localSet.isAlwaysEmpty then curEnv = Env(cls, nestedInOwner = false, localSet, isBoxed = false, curEnv)
471471
try
472472
val thisSet = cls.classInfo.selfType.captureSet.withDescription(i"of the self type of $cls")
473473
checkSubset(localSet, thisSet, tree.srcPos) // (2)
@@ -514,7 +514,7 @@ class CheckCaptures extends Recheck, SymTransformer:
514514
override def recheck(tree: Tree, pt: Type = WildcardType)(using Context): Type =
515515
if tree.isTerm && pt.isBoxedCapturing then
516516
val saved = curEnv
517-
curEnv = Env(curEnv.owner, false, CaptureSet.Var(), isBoxed = true, curEnv)
517+
curEnv = Env(curEnv.owner, nestedInOwner = false, CaptureSet.Var(), isBoxed = true, curEnv)
518518
try super.recheck(tree, pt)
519519
finally curEnv = saved
520520
else
@@ -613,7 +613,7 @@ class CheckCaptures extends Recheck, SymTransformer:
613613
covariant: Boolean, boxed: Boolean,
614614
reconstruct: (List[Type], Type) => Type): (Type, CaptureSet) =
615615
val saved = curEnv
616-
curEnv = Env(curEnv.owner, true, CaptureSet.Var(), isBoxed = false, if boxed then null else curEnv)
616+
curEnv = Env(curEnv.owner, nestedInOwner = true, CaptureSet.Var(), isBoxed = false, if boxed then null else curEnv)
617617

618618
try
619619
val (eargs, eres) = expected.dealias match
@@ -643,7 +643,7 @@ class CheckCaptures extends Recheck, SymTransformer:
643643
covariant: Boolean, boxed: Boolean,
644644
reconstruct: Type => Type): (Type, CaptureSet) =
645645
val saved = curEnv
646-
curEnv = Env(curEnv.owner, true, CaptureSet.Var(), isBoxed = false, if boxed then null else curEnv)
646+
curEnv = Env(curEnv.owner, nestedInOwner = true, CaptureSet.Var(), isBoxed = false, if boxed then null else curEnv)
647647

648648
try
649649
val eres = expected.dealias.stripCapturing match

0 commit comments

Comments
 (0)