Skip to content

Commit 11c18aa

Browse files
authored
Merge pull request scala/scala#8744 from som-snytt/review/noise
Noise reduction
2 parents 7870283 + cee6de0 commit 11c18aa

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

library/src/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.

library/src/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

library/src/scala/collection/mutable/StringBuilder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import scala.Predef.{ // unimport char-related implicit conversions to avoid tri
2323
genericWrapArray => _,
2424
wrapCharArray => _,
2525
wrapString => _,
26-
_
26+
//_
2727
}
2828

2929
/** A builder for mutable sequence of characters. This class provides an API

library/src/scala/runtime/NonLocalReturnControl.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
* additional information regarding copyright ownership.
1111
*/
1212

13-
package scala
14-
package runtime
13+
package scala.runtime
1514

1615
import scala.util.control.ControlThrowable
1716

18-
class NonLocalReturnControl[@specialized T](val key: AnyRef, val value: T) extends ControlThrowable {
17+
// remove Unit specialization when binary compatibility permits
18+
class NonLocalReturnControl[@specialized(Byte, Short, Int, Long, Char, Float, Double, Boolean, Unit) T](val key: AnyRef, val value: T) extends ControlThrowable {
1919
final override def fillInStackTrace(): Throwable = this
2020
}

0 commit comments

Comments
 (0)