Skip to content

Commit f3e2d3b

Browse files
committed
Revert "workaround scala#14626"
Martin's fix removes the need for this workaround This reverts commit 36e0c29.
1 parent 4782f8d commit f3e2d3b

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
@@ -517,7 +517,7 @@ object Denotations {
517517
* otherwise generate new synthetic names.
518518
*/
519519
private def mergeParamNames(tp1: LambdaType, tp2: LambdaType): List[tp1.ThisName] =
520-
(for case (name1, name2, idx) <- tp1.paramNames.lazyZip(tp2.paramNames).lazyZip(tp1.paramNames.indices)
520+
(for ((name1, name2, idx) <- tp1.paramNames.lazyZip(tp2.paramNames).lazyZip(tp1.paramNames.indices))
521521
yield if (name1 == name2) name1 else tp1.companion.syntheticParamName(idx)).toList
522522

523523
/** 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
@@ -752,7 +752,7 @@ object Symbols {
752752
}
753753
val tparams = tparamBuf.toList
754754
val bounds = boundsFn(trefBuf.toList)
755-
for case (tparam, bound) <- tparams.lazyZip(bounds) do
755+
for (tparam, bound) <- tparams.lazyZip(bounds) do
756756
tparam.info = bound
757757
tparams
758758
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ object Splicer {
309309
def interpretArgsGroup(args: List[Tree], argTypes: List[Type]): List[Object] =
310310
assert(args.size == argTypes.size)
311311
val view =
312-
for case (arg, info) <- args.lazyZip(argTypes) yield
312+
for (arg, info) <- args.lazyZip(argTypes) yield
313313
info match
314314
case _: ExprType => () => interpretTree(arg) // by-name argument
315315
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
@@ -141,7 +141,7 @@ object RefChecks {
141141
if parentCls.is(Trait) then
142142
val params = parentCls.asClass.paramGetters
143143
val args = termArgss(app).flatten
144-
for case (param, arg) <- params.lazyZip(args) do
144+
for (param, arg) <- params.lazyZip(args) do
145145
if !param.is(Private) then // its type can be narrowed through intersection -> a check is needed
146146
val paramType = cls.thisType.memberInfo(param)
147147
if !(arg.tpe <:< paramType) then

0 commit comments

Comments
 (0)