Skip to content

Commit 36e0c29

Browse files
committed
workaround scala#14626
1 parent 8ae089a commit 36e0c29

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

compiler/src/dotty/tools/dotc/core/Denotations.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ object Denotations {
513513
* otherwise generate new synthetic names.
514514
*/
515515
private def mergeParamNames(tp1: LambdaType, tp2: LambdaType): List[tp1.ThisName] =
516-
(for ((name1, name2, idx) <- tp1.paramNames.lazyZip(tp2.paramNames).lazyZip(tp1.paramNames.indices))
516+
(for case (name1, name2, idx) <- tp1.paramNames.lazyZip(tp2.paramNames).lazyZip(tp1.paramNames.indices)
517517
yield if (name1 == name2) name1 else tp1.companion.syntheticParamName(idx)).toList
518518

519519
/** Normally, `tp1 & tp2`, with extra care taken to return `tp1` or `tp2` directly if that's

compiler/src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ object Symbols {
754754
}
755755
val tparams = tparamBuf.toList
756756
val bounds = boundsFn(trefBuf.toList)
757-
for (tparam, bound) <- tparams.lazyZip(bounds) do
757+
for case (tparam, bound) <- tparams.lazyZip(bounds) do
758758
tparam.info = bound
759759
tparams
760760
}

compiler/src/dotty/tools/dotc/transform/Splicer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ object Splicer {
307307
def interpretArgsGroup(args: List[Tree], argTypes: List[Type]): List[Object] =
308308
assert(args.size == argTypes.size)
309309
val view =
310-
for (arg, info) <- args.lazyZip(argTypes) yield
310+
for case (arg, info) <- args.lazyZip(argTypes) yield
311311
info match
312312
case _: ExprType => () => interpretTree(arg) // by-name argument
313313
case _ => interpretTree(arg) // by-value argument

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ object RefChecks {
140140
if parentCls.is(Trait) then
141141
val params = parentCls.asClass.paramGetters
142142
val args = termArgss(app).flatten
143-
for (param, arg) <- params.lazyZip(args) do
143+
for case (param, arg) <- params.lazyZip(args) do
144144
if !param.is(Private) then // its type can be narrowed through intersection -> a check is needed
145145
val paramType = cls.thisType.memberInfo(param)
146146
if !(arg.tpe <:< paramType) then

0 commit comments

Comments
 (0)