Skip to content

Commit 2849a0a

Browse files
committed
Revert unwanted changes to imports
1 parent 8aae5b2 commit 2849a0a

File tree

17 files changed

+12
-23
lines changed

17 files changed

+12
-23
lines changed

src/compiler/scala/reflect/macros/compiler/Errors.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package scala.reflect.macros
1414
package compiler
1515

1616
import java.lang.System.{lineSeparator => EOL}
17-
1817
import scala.annotation.tailrec
1918
import scala.reflect.macros.util.Traces
2019

src/compiler/scala/tools/nsc/Global.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import scala.tools.nsc.classpath._
4141
import scala.tools.nsc.profile.Profiler
4242
import scala.util.control.NonFatal
4343
import java.io.Closeable
44-
4544
import scala.annotation.tailrec
4645

4746
class Global(var currentSettings: Settings, reporter0: LegacyReporter)

src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ package tools.nsc
1515
package ast
1616

1717
import scala.language.implicitConversions
18+
1819
import java.awt.{List => _, _}
1920
import java.awt.event._
2021
import java.io.{StringWriter, Writer}
21-
2222
import javax.swing._
2323
import javax.swing.event.TreeModelListener
2424
import javax.swing.tree._
25-
import java.util.concurrent.locks._
2625

26+
import java.util.concurrent.locks._
2727
import scala.annotation.tailrec
2828

2929
/**

src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package ast.parser
1919
import scala.collection.mutable
2020
import mutable.ListBuffer
2121
import scala.reflect.internal.{Precedence, ModifierFlags => Flags}
22-
import scala.reflect.internal.util.{FreshNameCreator, ListOfNil, Position, SourceFile}
22+
import scala.reflect.internal.util.{ SourceFile, Position, FreshNameCreator, ListOfNil }
2323
import Tokens._
2424
import scala.annotation.tailrec
2525

src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import BackendReporting._
1919
import scala.tools.asm.ClassWriter
2020
import scala.tools.nsc.backend.jvm.BCodeHelpers.ScalaSigBytes
2121
import scala.tools.nsc.reporters.NoReporter
22+
2223
import PartialFunction.cond
2324
import scala.annotation.tailrec
2425

src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package scala.tools.nsc
1414
package backend.jvm
1515

1616
import java.{util => ju}
17-
1817
import scala.annotation.tailrec
1918
import scala.collection.concurrent
2019
import scala.tools.asm

src/compiler/scala/tools/nsc/fsc/SocketServer.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package scala.tools.nsc.fsc
1515
import scala.tools.util.SystemExit
1616
import java.io.{BufferedReader, PrintStream, PrintWriter}
1717
import java.net.{ServerSocket, SocketException, SocketTimeoutException}
18-
1918
import scala.annotation.tailrec
2019

2120
trait CompileOutputCommon {

src/compiler/scala/tools/nsc/io/SourceReader.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import java.io.{FileInputStream, IOException}
1717
import java.nio.{ByteBuffer, CharBuffer}
1818
import java.nio.channels.{Channels, ClosedByInterruptException, ReadableByteChannel}
1919
import java.nio.charset.{CharsetDecoder, CoderResult}
20-
2120
import scala.annotation.tailrec
2221
import scala.reflect.internal.Reporter
2322

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

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

1515
import scala.annotation.tailrec
16-
import scala.tools.nsc.symtab.Flags.{ARTIFACT, SYNTHETIC}
16+
import scala.tools.nsc.symtab.Flags.{SYNTHETIC, ARTIFACT}
1717
import scala.collection.mutable
1818
import scala.reflect.internal.util.Position
1919

src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala

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

16-
import scala.reflect.internal.util.StringOps.{countAsString, countElementsAsString}
16+
import scala.reflect.internal.util.StringOps.{ countElementsAsString, countAsString }
1717
import java.lang.System.{lineSeparator => EOL}
18-
1918
import scala.annotation.tailrec
2019
import scala.reflect.runtime.ReflectionUtils
2120
import scala.reflect.macros.runtime.AbortMacroException

src/library/scala/reflect/ClassManifestDeprecatedApis.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
package scala
1414
package reflect
1515

16-
import scala.collection.mutable.{ArrayBuilder, ArraySeq}
16+
import scala.collection.mutable.{ ArraySeq, ArrayBuilder }
1717
import java.lang.{Class => jClass}
18-
1918
import scala.annotation.tailrec
2019

2120
@deprecated("use scala.reflect.ClassTag instead", "2.10.0")

src/library/scala/util/Properties.scala

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

1616
import java.io.{IOException, PrintWriter}
1717
import java.util.jar.Attributes.{Name => AttributeName}
18-
1918
import scala.annotation.tailrec
2019

2120
/** Loads `library.properties` from the jar. */

src/library/scala/util/Random.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ package util
1616
import scala.annotation.{migration, tailrec}
1717
import scala.collection.mutable.ArrayBuffer
1818
import scala.collection.BuildFrom
19-
import scala.collection.immutable.{LazyList, List}
20-
import scala.language.{higherKinds, implicitConversions}
19+
import scala.collection.immutable.{ List, LazyList }
20+
import scala.language.{implicitConversions, higherKinds}
2121

2222
/**
2323
* @author Stephane Micheloud

src/reflect/scala/reflect/internal/Printers.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ package reflect
1717
package internal
1818

1919
import java.io.{OutputStream, PrintWriter, Writer}
20-
2120
import Flags._
2221
import java.lang.System.{lineSeparator => EOL}
23-
2422
import scala.annotation.tailrec
2523

2624
trait Printers extends api.Printers { self: SymbolTable =>

src/reflect/scala/reflect/io/Path.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ package reflect
1515
package io
1616

1717
import scala.language.implicitConversions
18+
1819
import java.io.{RandomAccessFile, File => JFile}
1920
import java.net.{URI, URL}
20-
2121
import scala.annotation.tailrec
2222
import scala.util.Random.alphanumeric
2323

src/reflect/scala/reflect/io/Streamable.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ package io
1717
import java.net.URL
1818
import java.io.{BufferedInputStream, InputStream}
1919
import java.io.{BufferedReader, InputStreamReader, Closeable => JCloseable}
20-
21-
import scala.io.{BufferedSource, Codec, Source}
20+
import scala.io.{ Codec, BufferedSource, Source }
2221
import scala.collection.mutable.ArrayBuffer
2322
import Path.fail
2423
import scala.annotation.tailrec

src/reflect/scala/reflect/runtime/ReflectionUtils.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ package scala
1414
package reflect.runtime
1515

1616
import java.lang.{Class => jClass}
17-
import java.lang.reflect.{InvocationTargetException, Method, UndeclaredThrowableException}
18-
17+
import java.lang.reflect.{ Method, InvocationTargetException, UndeclaredThrowableException }
1918
import scala.annotation.tailrec
2019
import scala.reflect.internal.util.AbstractFileClassLoader
2120
import scala.reflect.io._

0 commit comments

Comments
 (0)