Skip to content

Commit e399c43

Browse files
Migrate varargs syntax from : _* to * in dotty project (#18822)
2 parents 80eb6e1 + 6812835 commit e399c43

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+123
-118
lines changed

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
18251825
else
18261826
jliLambdaMetaFactoryMetafactoryHandle
18271827

1828-
bc.jmethod.visitInvokeDynamicInsn(methodName, desc, metafactory, bsmArgs: _*)
1828+
bc.jmethod.visitInvokeDynamicInsn(methodName, desc, metafactory, bsmArgs*)
18291829

18301830
generatedType
18311831
}

compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ trait BCodeIdiomatic {
247247
): Unit = {
248248
jmethod.visitInvokeDynamicInsn(
249249
"makeConcatWithConstants",
250-
asm.Type.getMethodDescriptor(StringRef.toASMType, argTypes:_*),
250+
asm.Type.getMethodDescriptor(StringRef.toASMType, argTypes*),
251251
coreBTypes.jliStringConcatFactoryMakeConcatWithConstantsHandle,
252-
(recipe +: constants):_*
252+
(recipe +: constants)*
253253
)
254254
}
255255

@@ -522,7 +522,7 @@ trait BCodeIdiomatic {
522522
i += 1
523523
}
524524
assert(oldPos == keys.length, "emitSWITCH")
525-
jmethod.visitTableSwitchInsn(keyMin, keyMax, defaultBranch, newBranches: _*)
525+
jmethod.visitTableSwitchInsn(keyMin, keyMax, defaultBranch, newBranches*)
526526
} else {
527527
jmethod.visitLookupSwitchInsn(defaultBranch, keys, branches)
528528
}

compiler/src/dotty/tools/backend/jvm/BackendUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class BackendUtils(val postProcessor: PostProcessor) {
107107
val mv = cw.visitMethod(ACC_PRIVATE + ACC_STATIC + ACC_SYNTHETIC, "$deserializeLambda$", serializedLamdaObjDesc, null, null)
108108
def emitLambdaDeserializeIndy(targetMethods: Seq[Handle]): Unit = {
109109
mv.visitVarInsn(ALOAD, 0)
110-
mv.visitInvokeDynamicInsn("lambdaDeserialize", serializedLamdaObjDesc, jliLambdaDeserializeBootstrapHandle, targetMethods: _*)
110+
mv.visitInvokeDynamicInsn("lambdaDeserialize", serializedLamdaObjDesc, jliLambdaDeserializeBootstrapHandle, targetMethods*)
111111
}
112112

113113
val targetMethodGroupLimit = 255 - 1 - 3 // JVM limit. See See MAX_MH_ARITY in CallSite.java

compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ClassfileWriters(frontendAccess: PostProcessorFrontendAccess) {
201201
val parent = filePath.getParent
202202
if (!builtPaths.containsKey(parent)) {
203203
parent.iterator.forEachRemaining(checkName)
204-
try Files.createDirectories(parent, noAttributes: _*)
204+
try Files.createDirectories(parent, noAttributes*)
205205
catch {
206206
case e: FileAlreadyExistsException =>
207207
// `createDirectories` reports this exception if `parent` is an existing symlink to a directory

compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ abstract class CoreBTypesFromSymbols[I <: DottyBackendInterface] extends CoreBTy
233233
(List(LARRAY_LENGTH, LARRAY_GET, LARRAY_SET) map (_ -> LONG)) ++
234234
(List(FARRAY_LENGTH, FARRAY_GET, FARRAY_SET) map (_ -> FLOAT)) ++
235235
(List(DARRAY_LENGTH, DARRAY_GET, DARRAY_SET) map (_ -> DOUBLE)) ++
236-
(List(OARRAY_LENGTH, OARRAY_GET, OARRAY_SET) map (_ -> ObjectRef)) : _*
236+
(List(OARRAY_LENGTH, OARRAY_GET, OARRAY_SET) map (_ -> ObjectRef)) *
237237
)
238238
}
239239
}

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
5656

5757
override def asClassPathStrings: Seq[String] = aggregates.map(_.asClassPathString).distinct
5858

59-
override def asSourcePathString: String = ClassPath.join(aggregates map (_.asSourcePathString): _*)
59+
override def asSourcePathString: String = ClassPath.join(aggregates map (_.asSourcePathString)*)
6060

6161
override private[dotty] def packages(inPackage: PackageName): Seq[PackageEntry] = {
6262
val aggregatedPackages = aggregates.flatMap(_.packages(inPackage)).distinct

compiler/src/dotty/tools/dotc/config/Feature.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ object Feature:
2626
val dependent = experimental("dependent")
2727
val erasedDefinitions = experimental("erasedDefinitions")
2828
val symbolLiterals = deprecated("symbolLiterals")
29+
val ascriptionVarargsUnpacking = deprecated("ascriptionVarargsUnpacking")
2930
val fewerBraces = experimental("fewerBraces")
3031
val saferExceptions = experimental("saferExceptions")
3132
val clauseInterleaving = experimental("clauseInterleaving")

compiler/src/dotty/tools/dotc/config/Settings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object Settings:
2424
val OutputTag: ClassTag[AbstractFile] = ClassTag(classOf[AbstractFile])
2525

2626
class SettingsState(initialValues: Seq[Any]):
27-
private val values = ArrayBuffer(initialValues: _*)
27+
private val values = ArrayBuffer(initialValues*)
2828
private var _wasRead: Boolean = false
2929

3030
override def toString: String = s"SettingsState(values: ${values.toList})"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ object Contexts {
414414
* from constructor parameters to class parameter accessors.
415415
*/
416416
def superCallContext: Context = {
417-
val locals = newScopeWith(owner.typeParams ++ owner.asClass.paramAccessors: _*)
417+
val locals = newScopeWith(owner.typeParams ++ owner.asClass.paramAccessors*)
418418
superOrThisCallContext(owner.primaryConstructor, locals)
419419
}
420420

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ object Flags {
188188
flag
189189
}
190190

191-
def commonFlags(flagss: FlagSet*): FlagSet = union(flagss.map(_.toCommonFlags): _*)
191+
def commonFlags(flagss: FlagSet*): FlagSet = union(flagss.map(_.toCommonFlags)*)
192192

193193
/** The empty flag set */
194194
val EmptyFlags: FlagSet = FlagSet(0)

0 commit comments

Comments
 (0)