8000 Merge pull request #8744 from som-snytt/review/noise · scala/scala@5575d98 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5575d98

Browse files
som-snyttsom-snytt
authored
Merge pull request #8744 from som-snytt/review/noise
Noise reduction
2 parents c0255bb + 8cce614 commit 5575d98

File tree

15 files changed

+19
-35
lines changed

15 files changed

+19
-35
lines changed

‎src/compiler/scala/tools/nsc/CompilerCommand.scala

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
package scala.tools.nsc
1414

15-
import java.nio.file.Files
16-
1715
/** A class representing command line info for scalac */
1816
class CompilerCommand(arguments: List[String], val settings: Settings) {
1917
def this(arguments: List[String], error: String => Unit) = this(arguments, new Settings(error))
@@ -124,18 +122,15 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
124122
else allSettings.valuesIterator.filter(_.isHelping).map(_.help).mkString("\n\n")
125123
}
126124

127-
/**
128-
* Expands all arguments starting with @ to the contents of the
129-
* file named like each argument.
130-
*/
125+
/** Expands all arguments starting with @ to the contents of the file named like each argument. */
131126
def expandArg(arg: String): List[String] = {
132-
def stripComment(s: String) = s takeWhile (_ != '#')
133-
import java.nio.file._
127+
import java.nio.file.{Files, Paths}
134128
import scala.jdk.CollectionConverters._
129+
def stripComment(s: String) = s.takeWhile(_ != '#')
135130
val file = Paths.get(arg stripPrefix "@")
136131
if (!Files.exists(file))
137-
throw new java.io.FileNotFoundException("argument file %s could not be found" format file)
138-
settings splitParams (Files.readAllLines(file).asScala map stripComment mkString " ")
132+
throw new java.io.FileNotFoundException(s"argument file $file could not be found")
133+
settings.splitParams(Files.readAllLines(file).asScala.map(stripComment).mkString(" "))
139134
}
140135

141136
// override this if you don't want arguments processed here

‎src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ package scala.tools.nsc.classpath
1414

1515
import java.io.{Closeable, File}
1616
import java.net.URL
17-
import java.nio.file.{FileSystems, Files}
18-
import java.util
1917

2018
import scala.reflect.io.{AbstractFile, PlainFile, PlainNioFile}
2119
import scala.tools.nsc.util.{ClassPath, ClassRepresentation, EfficientClassPath}
@@ -117,7 +115,7 @@ trait JFileDirectoryLookup[FileEntryType <: ClassRepresentation] extends Directo
117115
//
118116
// Note this behaviour can be enabled in javac with `javac -XDsortfiles`, but that's only
119117
// intended to improve determinism of the compiler for compiler hackers.
120-
util.Arrays.sort(listing, (o1: File, o2: File) => o1.getName.compareTo(o2.getName))
118+
java.util.Arrays.sort(listing, (o1: File, o2: File) => o1.getName.compareTo(o2.getName))
121119
listing
122120
}
123121
protected def getName(f: File): String = f.getName

‎src/compiler/scala/tools/nsc/fsc/Socket.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313
package scala.tools.nsc.fsc
1414

15-
import java.io.{IOException, InputStreamReader, BufferedReader, PrintWriter, Closeable}
16-
import java.io.{BufferedOutputStream, BufferedReader}
15+
import java.io.{BufferedOutputStream, BufferedReader, Closeable, InputStreamReader, IOException, PrintWriter}
1716
import java.net.{InetAddress, Socket => JSocket}
1817
import scala.io.Codec
1918
import scala.reflect.io.Streamable

‎src/compiler/scala/tools/nsc/plugins/Plugins.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
package scala.tools.nsc
1414
package plugins
1515

16-
import java.net.URL
17-
1816
import java.net.URL
1917
import java.util
2018

‎src/compiler/scala/tools/nsc/transform/patmat/MatchCodeGen.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package scala.tools.nsc.transform.patmat
1414

1515
import scala.tools.nsc.symtab.Flags.SYNTHETIC
16-
import scala.reflect.internal.util.Position
1716

1817
/** Factory methods used by TreeMakers to make the actual trees.
1918
*

‎src/compiler/scala/tools/nsc/transform/patmat/MatchOptimization.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
package scala.tools.nsc.transform.patmat
1414

1515
import scala.annotation.tailrec
16-
import scala.tools.nsc.symtab.Flags.{MUTABLE, STABLE}
1716
import scala.collection.mutable
18-
import scala.reflect.internal.util.Position
17+
import scala.tools.nsc.symtab.Flags.{MUTABLE, STABLE}
1918

2019
/** Optimize and analyze matches based on their TreeMaker-representation.
2120
*

‎src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
package scala.tools.nsc.transform.patmat
1414

1515
import scala.annotation.tailrec
16-
import scala.tools.nsc.symtab.Flags.{SYNTHETIC, ARTIFACT}
1716
import scala.collection.mutable
18-
import scala.reflect.internal.util.Position
17+
import scala.tools.nsc.symtab.Flags.{SYNTHETIC, ARTIFACT}
1918

2019
/** Translate our IR (TreeMakers) into actual Scala Trees using the factory methods in MatchCodeGen.
2120
*

‎src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ package scala.tools.nsc.transform.patmat
1414

1515
import scala.annotation.tailrec
1616
import scala.collection.mutable.ListBuffer
17+
import scala.reflect.internal.{Mode, Types}
18+
import scala.reflect.internal.util.Statistics
1719
import scala.tools.nsc.Global
1820
import scala.tools.nsc.ast
19-
import scala.tools.nsc.transform.TypingTransformers
20-
import scala.tools.nsc.transform.Transform
21-
import scala.reflect.internal.util.Statistics
22-
import scala.reflect.internal.{Mode, Types}
23-
import scala.reflect.internal.util.Position
21+
import scala.tools.nsc.transform.{Transform, TypingTransformers}
2422

2523
/** Translate pattern matching.
2624
*

‎src/library/scala/collection/immutable/LongMap.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import java.lang.IllegalStateException
1818
import scala.collection.generic.{BitOperations, DefaultSerializationProxy}
1919
import scala.collection.mutable.{Builder, ImmutableBuilder, ListBuffer}
2020
import scala.annotation.tailrec
21-
import scala.annotation.tailrec
2221
import scala.annotation.unchecked.uncheckedVariance
2322

2423
/** Utility class for long maps.

‎src/library/scala/collection/mutable/ListBuffer.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package mutable
1515

1616
import scala.annotation.tailrec
1717
import scala.collection.immutable.{List, Nil, ::}
18-
import scala.annotation.tailrec
1918
import java.lang.{IllegalArgumentException, IndexOutOfBoundsException}
2019
import scala.collection.generic.DefaultSerializable
2120
import scala.runtime.Statics.releaseFence

0 commit comments

Comments
 (0)
0