Skip to content

Commit b2feafe

Browse files
lolgablolgab
committed
Use ::: instead of ++ to concatenate Lists
1 parent a37dac6 commit b2feafe

Some content is hidden

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

49 files changed

+121
-121
lines changed

‎compiler/src/dotty/tools/MainGenericCompiler.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ object MainGenericCompiler {
125125
process(tail, settings.withCompiler)
126126
case ("-cp" | "-classpath" | "--class-path") :: cp :: tail =>
127127
val (tailargs, newEntries) = MainGenericRunner.processClasspath(cp, tail)
128-
process(tailargs, settings.copy(classPath = settings.classPath ++ newEntries.filter(_.nonEmpty)))
128+
process(tailargs, settings.copy(classPath = settings.classPath ::: newEntries.filter(_.nonEmpty)))
129129
case "-Oshort" :: tail =>
130130
// Nothing is to be done here. Request that the user adds the relevant flags manually.
131131
// i.e this has no effect when MainGenericRunner is invoked programatically.
@@ -150,7 +150,7 @@ object MainGenericCompiler {
150150
else List("-classpath", settings.classPath.mkString(classpathSeparator))
151151

152152
def reconstructedArgs() =
153-
classpathSetting ++ settings.scalaArgs ++ settings.residualArgs
153+
classpathSetting ::: settings.scalaArgs ::: settings.residualArgs
154154

155155
def addJavaProps(): Unit =
156156
settings.javaProps.foreach { (k, v) => sys.props(k) = v }
@@ -172,8 +172,8 @@ object MainGenericCompiler {
172172
addJavaProps()
173173
val properArgs =
174174
reconstructedArgs()
175-
++ List("-script", settings.targetScript)
176-
++ settings.scriptArgs
175+
::: List("-script", settings.targetScript)
176+
::: settings.scriptArgs
177177
scripting.Main.main(properArgs.toArray)
178178
case CompileMode.Repl | CompileMode.Run =>
179179
addJavaProps()

‎compiler/src/dotty/tools/MainGenericRunner.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ object MainGenericRunner {
110110
// globdir is wildcard directory for globbed jar files, reconstruct the intended classpath
111111
val cpJars = tail.takeWhile( f => validGlobbedJar(f) )
112112
val remainingArgs = tail.drop(cpJars.size)
113-
(remainingArgs, cpEntries ++ cpJars)
113+
(remainingArgs, cpEntries ::: cpJars)
114114
else
115115
(tail, cpEntries)
116116

@@ -125,7 +125,7 @@ object MainGenericRunner {
125125
processArgs(tail, settings.withExecuteMode(ExecuteMode.Run).withTargetToRun(fqName))
126126
case ("-cp" | "-classpath" | "--class-path") :: cp :: tail =>
127127
val (tailargs, newEntries) = processClasspath(cp, tail)
128-
processArgs(tailargs, settings.copy(classPath = settings.classPath ++ newEntries.filter(_.nonEmpty)))
128+
processArgs(tailargs, settings.copy(classPath = settings.classPath ::: newEntries.filter(_.nonEmpty)))
129129
case ("-version" | "--version") :: _ =>
130130
settings.copy(
131131
executeMode = ExecuteMode.Repl,
@@ -148,7 +148,7 @@ object MainGenericRunner {
148148
case (o @ javaOption(striped)) :: tail =>
149149
processArgs(tail, settings.withJavaArgs(striped).withScalaArgs(o))
150150
case (o @ scalaOption(_*)) :: tail =>
151-
val remainingArgs = (CommandLineParser.expandArg(o) ++ tail).toList
151+
val remainingArgs = (CommandLineParser.expandArg(o) ::: tail).toList
152152
processArgs(remainingArgs, settings)
153153
case (o @ colorOption(_*)) :: tail =>
154154
processArgs(tail, settings.withScalaArgs(o))
@@ -189,7 +189,7 @@ object MainGenericRunner {
189189
case ExecuteMode.Repl =>
190190
val properArgs =
191191
List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
192-
++ settings.residualArgs
192+
::: settings.residualArgs
193193
repl.Main.main(properArgs.toArray)
194194
None
195195

@@ -242,11 +242,11 @@ object MainGenericRunner {
242242
else
243243
val properArgs =
244244
List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
245-
++ settings.residualArgs
246-
++ (if settings.save then List("-save") else Nil)
247-
++ settings.scalaArgs
248-
++ List("-script", settings.targetScript)
249-
++ settings.scriptArgs
245+
::: settings.residualArgs
246+
::: (if settings.save then List("-save") else Nil)
247+
::: settings.scalaArgs
248+
::: List("-script", settings.targetScript)
249+
::: settings.scriptArgs
250250
scripting.Main.process(properArgs.toArray)
251251

252252
case ExecuteMode.Expression =>
@@ -255,7 +255,7 @@ object MainGenericRunner {
255255
case list => list.mkString(classpathSeparator)
256256
}
257257
val cpArgs = if cp.isEmpty then Nil else List("-classpath", cp)
258-
val properArgs = cpArgs ++ settings.residualArgs ++ settings.scalaArgs
258+
val properArgs = cpArgs ::: settings.residualArgs ::: settings.scalaArgs
259259
val driver = StringDriver(properArgs.toArray, settings.targetExpression)
260260
driver.compileAndRun(settings.classPath)
261261

‎compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I, val frontendAcce
151151
else Nil
152152
}
153153

154-
nestedClasses ++ companionModuleMembers
154+
nestedClasses ::: companionModuleMembers
155155
}
156156

157157
/**

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,14 @@ abstract class CoreBTypesFromSymbols[I <: DottyBackendInterface] extends CoreBTy
220220
lazy val typeOfArrayOp: Map[Int, BType] = {
221221
import dotty.tools.backend.ScalaPrimitivesOps._
222222
Map(
223-
(List(ZARRAY_LENGTH, ZARRAY_GET, ZARRAY_SET) map (_ -> BOOL)) ++
224-
(List(BARRAY_LENGTH, BARRAY_GET, BARRAY_SET) map (_ -> BYTE)) ++
225-
(List(SARRAY_LENGTH, SARRAY_GET, SARRAY_SET) map (_ -> SHORT)) ++
226-
(List(CARRAY_LENGTH, CARRAY_GET, CARRAY_SET) map (_ -> CHAR)) ++
227-
(List(IARRAY_LENGTH, IARRAY_GET, IARRAY_SET) map (_ -> INT)) ++
228-
(List(LARRAY_LENGTH, LARRAY_GET, LARRAY_SET) map (_ -> LONG)) ++
229-
(List(FARRAY_LENGTH, FARRAY_GET, FARRAY_SET) map (_ -> FLOAT)) ++
230-
(List(DARRAY_LENGTH, DARRAY_GET, DARRAY_SET) map (_ -> DOUBLE)) ++
223+
(List(ZARRAY_LENGTH, ZARRAY_GET, ZARRAY_SET) map (_ -> BOOL)) :::
224+
(List(BARRAY_LENGTH, BARRAY_GET, BARRAY_SET) map (_ -> BYTE)) :::
225+
(List(SARRAY_LENGTH, SARRAY_GET, SARRAY_SET) map (_ -> SHORT)) :::
226+
(List(CARRAY_LENGTH, CARRAY_GET, CARRAY_SET) map (_ -> CHAR)) :::
227+
(List(IARRAY_LENGTH, IARRAY_GET, IARRAY_SET) map (_ -> INT)) :::
228+
(List(LARRAY_LENGTH, LARRAY_GET, LARRAY_SET) map (_ -> LONG)) :::
229+
(List(FARRAY_LENGTH, FARRAY_GET, FARRAY_SET) map (_ -> FLOAT)) :::
230+
(List(DARRAY_LENGTH, DARRAY_GET, DARRAY_SET) map (_ -> DOUBLE)) :::
231231
(List(OARRAY_LENGTH, OARRAY_GET, OARRAY_SET) map (_ -> ObjectRef)) : _*
232232
)
233233
}

‎compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ class JSCodeGen()(using genCtx: Context) {
380380
}
381381

382382
// Generate fields and add to methods + ctors
383-
val generatedMembers = genClassFields(td) ++ generatedNonFieldMembers.toList
383+
val generatedMembers = genClassFields(td) ::: generatedNonFieldMembers.toList
384384

385385
// Generate member exports
386386
val memberExports = jsExportsGen.genMemberExports(sym)
@@ -1346,12 +1346,12 @@ class JSCodeGen()(using genCtx: Context) {
13461346
}
13471347

13481348
ifOverload(tree, js.Block(
1349-
inner ++ tree.ctor.beforeCall ++ captureAssigns ++ normalAssigns))
1349+
inner ::: tree.ctor.beforeCall ::: captureAssigns ::: normalAssigns))
13501350
}
13511351

13521352
def postStats(tree: ConstructorTree[SplitSecondaryJSCtor]): js.Tree = {
13531353
val inner = tree.subCtors.map(postStats(_))
1354-
ifOverload(tree, js.Block(tree.ctor.afterCall ++ inner))
1354+
ifOverload(tree, js.Block(tree.ctor.afterCall ::: inner))
13551355
}
13561356

13571357
val primaryCtor = ctorTree.ctor

‎compiler/src/dotty/tools/dotc/Run.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
338338
SourceFile.virtual(name, source)
339339
}
340340
val sources =
341-
scalaSources.map(sourceFile(_, isJava = false)) ++
341+
scalaSources.map(sourceFile(_, isJava = false)) :::
342342
javaSources.map(sourceFile(_, isJava = true))
343343

344344
compileSources(sources)

‎compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ object desugar {
418418
case evidenceParams =>
419419
val paramss1 = meth.paramss.reverse match
420420
case ValDefs(vparams @ (vparam :: _)) :: rparamss if vparam.mods.isOneOf(GivenOrImplicit) =>
421-
((evidenceParams ++ vparams) :: rparamss).reverse
421+
((evidenceParams ::: vparams) :: rparamss).reverse
422422
case _ =>
423423
meth.paramss :+ evidenceParams
424424
cpy.DefDef(meth)(paramss = paramss1)
@@ -886,7 +886,7 @@ object desugar {
886886
val originalVparamsIt = originalVparamss.iterator.flatten
887887
derivedVparamss match {
888888
case first :: rest =>
889-
first.map(_.withMods(originalVparamsIt.next().mods | caseAccessor)) ++
889+
first.map(_.withMods(originalVparamsIt.next().mods | caseAccessor)) :::
890890
rest.flatten.map(_.withMods(originalVparamsIt.next().mods))
891891
case _ =>
892892
Nil
@@ -987,7 +987,7 @@ object desugar {
987987

988988
def badRightAssoc(problem: String) =
989989
report.error(em"right-associative extension method $problem", mdef.srcPos)
990-
extParamss ++ mdef.paramss
990+
extParamss ::: mdef.paramss
991991

992992
rightParam match
993993
case ValDefs(vparam :: Nil) =>
@@ -1009,9 +1009,9 @@ object desugar {
10091009
badRightAssoc("must start with a single parameter")
10101010
case _ =>
10111011
// no value parameters, so not an infix operator.
1012-
extParamss ++ mdef.paramss
1012+
extParamss ::: mdef.paramss
10131013
else
1014-
extParamss ++ mdef.paramss
1014+
extParamss ::: mdef.paramss
10151015
).withMods(mdef.mods | ExtensionMethod)
10161016

10171017
/** Transform extension construct to list of extension methods */

‎compiler/src/dotty/tools/dotc/ast/MainProxies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object MainProxies {
1414

1515
/** Generate proxy classes for @main functions and @myMain functions where myMain <:< MainAnnotation */
1616
def proxies(stats: List[tpd.Tree])(using Context): List[untpd.Tree] = {
17-
mainAnnotationProxies(stats) ++ mainProxies(stats)
17+
mainAnnotationProxies(stats) ::: mainProxies(stats)
1818
}
1919

2020
/** Generate proxy classes for @main functions.

‎compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ class TreeTypeMap(
190190
copy(
191191
typeMap,
192192
treeMap,
193-
from ++ oldOwners,
194-
to ++ newOwners,
195-
from ++ substFrom,
196-
to ++ substTo)
193+
from ::: oldOwners,
194+
to ::: newOwners,
195+
from ::: substFrom,
196+
to ::: substTo)
197197
}
198198

199199
/** Apply `typeMap` and `ownerMap` to given symbols `syms`

‎compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@ object Trees {
18481848
def joinParams(tparams: List[TypeDef], paramss: List[ParamClause]): List[ParamClause] =
18491849
if tparams.isEmpty then paramss
18501850
else paramss match
1851-
case TypeDefs(tparams1) :: paramss1 => (tparams ++ tparams1) :: paramss1
1851+
case TypeDefs(tparams1) :: paramss1 => (tparams ::: tparams1) :: paramss1
18521852
case _ => tparams :: paramss
18531853

18541854
def isTermOnly(paramss: List[ParamClause]): Boolean = paramss match

0 commit comments

Comments
 (0)