Merge pull request #87 from folone/fix-sip23

Fix .check files for SIP-23

Author: Jon Pretty

.gitignore

@@ -39,9 +39,9 @@
 # eclipse, intellij, ensime
 /.classpath
 /.project
-/src/intellij/*.iml
-/src/intellij/*.ipr
-/src/intellij/*.iws
+/src/intellij*/*.iml
+/src/intellij*/*.ipr
+/src/intellij*/*.iws
 **/.cache
 /.idea
 /.settings

bincompat-backward.whitelist.conf

@@ -186,15 +186,6 @@ filter {
         matchName="scala.reflect.runtime.SynchronizedOps.newNestedScope"
         problemName=MissingMethodProblem
     },
-    // see github.com/scala/scala/pull/3925, SI-8627, SI-6440
-    {
-        matchName="scala.collection.TraversableLike.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.Stream.filteredTail"
-        problemName=MissingMethodProblem
-    },
     // https://github.com/scala/scala/pull/3848 -- SI-8680
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"

bincompat-forward.whitelist.conf

@@ -272,103 +272,6 @@ filter {
         matchName="scala.reflect.api.PredefTypeCreator"
         problemName=MissingClassProblem
     },
-    // see github.com/scala/scala/pull/3925, SI-8627, SI-6440
-    {
-        matchName="scala.collection.IterableViewLike#AbstractTransformed.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.AbstractTraversable.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.TraversableViewLike#AbstractTransformed.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.TraversableLike.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.SeqViewLike#AbstractTransformed.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.TreeSet.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.Stream.filteredTail"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.Stream.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.Stream.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.StringOps.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.immutable.TreeMap.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.concurrent.TrieMap.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofByte.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofLong.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofUnit.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofInt.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofChar.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofRef.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofDouble.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofFloat.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofBoolean.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.ArrayOps#ofShort.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.collection.mutable.TreeSet.filterImpl"
-        problemName=MissingMethodProblem
-    },
-    {
-        matchName="scala.reflect.io.AbstractFile.filterImpl"
-        problemName=MissingMethodProblem
-    },
     // https://github.com/scala/scala/pull/3848 -- SI-8680
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"

build.number

@@ -1,7 +1,7 @@
 #Tue Sep 11 19:21:09 CEST 2007
 version.major=2
 version.minor=11
-version.patch=3
+version.patch=5
 # This is the -N part of a version.  if it's 0, it's dropped from maven versions.
 version.bnum=0
 

docs/development/scala.tools.nsc/zipfile-bug.txt

@@ -71,7 +71,7 @@ The type of $e.x$ is the member type of the referenced entity in $T$.
 
 ### Example
 
-Assume the following two definitions of a objects named `X` in packages `P` and `Q`.
+Assume the following two definitions of objects named `X` in packages `P` and `Q`.
 
 ```scala
 package P {

spec/02-identifiers-names-and-scopes.md

@@ -846,7 +846,7 @@ the following holds:
   parameters by another, the result types as well as variances, lower and upper
   bounds of corresponding type parameters are equivalent.
 
-[^congruence]: A congruence is an equivalence relation which is closed under formation of contexts
+[^congruence]: A congruence is an equivalence relation which is closed under formation of contexts.
 [^implicit]: A method type is implicit if the parameter section that defines it starts with the `implicit` keyword.
 
 ### Conformance
@@ -889,15 +889,15 @@ transitive relation that satisfies the following conditions.
   if $T$ conforms to one of the [type instances](#existential-types)
   of `$U$ forSome {$\,Q\,$}`.
 - If
-  $T_i \equiv T'_i$ for $i \in \{ 1 , \ldots , n\}$ and $U$ conforms to $U'$
+  $T_i \equiv T_i'$ for $i \in \{ 1 , \ldots , n\}$ and $U$ conforms to $U'$
   then the method type $(p_1:T_1 , \ldots , p_n:T_n) U$ conforms to
-  $(p'_1:T'_1 , \ldots , p'_n:T'_n) U'$.
+  $(p_1':T_1' , \ldots , p_n':T_n') U'$.
 - The polymorphic type
   $[a_1 >: L_1 <: U_1 , \ldots , a_n >: L_n <: U_n] T$ conforms to the
   polymorphic type
-  $[a_1 >: L'_1 <: U'_1 , \ldots , a_n >: L'_n <: U'_n] T'$ if, assuming
-  $L'_1 <: a_1 <: U'_1 , \ldots , L'_n <: a_n <: U'_n$
-  one has $T <: T'$ and $L_i <: L'_i$ and $U'_i <: U_i$
+  $[a_1 >: L_1' <: U_1' , \ldots , a_n >: L_n' <: U_n'] T'$ if, assuming
+  $L_1' <: a_1 <: U_1' , \ldots , L_n' <: a_n <: U_n'$
+  one has $T <: T'$ and $L_i <: L_i'$ and $U_i' <: U_i$
   for $i \in \{ 1 , \ldots , n \}$.
 - Type constructors $T$ and $T'$ follow a similar discipline. We characterize
   $T$ and $T'$ by their type parameter clauses
@@ -964,7 +964,7 @@ limit [^4].
 
 The least upper bound or greatest lower bound might also not be
 unique. For instance `A with B` and `B with A` are both
-greatest lower of `A` and `B`. If there are several
+greatest lower bounds of `A` and `B`. If there are several
 least upper bounds or greatest lower bounds, the Scala compiler is
 free to pick any one of them.
 

spec/03-types.md

@@ -720,7 +720,7 @@ variable number of integer arguments.
 ```scala
 def sum(args: Int*) = {
   var result = 0
-  for (arg <- args) result += arg * arg
+  for (arg <- args) result += arg
   result
 }
 ```

spec/04-basic-declarations-and-definitions.md

@@ -1571,7 +1571,7 @@ $T$ is a value type; if it is a method type we apply
 means finding a substitution $\sigma$ of types $T_i$ for the type
 parameters $a_i$ such that
 
-- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
+- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
 - All type parameter bounds are respected, i.e.
   $\sigma L_i <: \sigma a_i$ and $\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$.
 - The expression's type conforms to the expected type, i.e.
@@ -1608,7 +1608,7 @@ constraint system means
 finding a substitution $\sigma$ of types $T_i$ for the type parameters
 $a_i$ such that
 
-- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
+- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
 - All type parameter bounds are respected, i.e. $\sigma L_i <: \sigma a_i$ and
   $\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$.
 - The method's result type $T'$ conforms to the expected type, i.e. $\sigma T' <: \sigma \mathit{pt}$.
@@ -1750,7 +1750,7 @@ a sub-expression of parameterless method type, is not evaluated in the expanded
 ### Dynamic Member Selection
 
 The standard Scala library defines a trait `scala.Dynamic` which defines a member
-\@invokeDynamic@ as follows:
+`applyDynamic` as follows:
 
 ```scala
 package scala

spec/06-expressions.md

@@ -115,7 +115,7 @@ type of the pattern. The pattern matches any value $v$ such that
 
 To resolve the syntactic overlap with a variable pattern, a
 stable identifier pattern may not be a simple name starting with a lower-case
-letter. However, it is possible to enclose a such a variable name in
+letter. However, it is possible to enclose such a variable name in
 backquotes; then it is treated as a stable identifier pattern.
 
 ###### Example
@@ -283,7 +283,7 @@ shorthand for the constructor or extractor pattern $\mathit{op}(p, q_1
 A pattern alternative `$p_1$ | $\ldots$ | $p_n$`
 consists of a number of alternative patterns $p_i$. All alternative
 patterns are type checked with the expected type of the pattern. They
-may no bind variables other than wildcards. The alternative pattern
+may not bind variables other than wildcards. The alternative pattern
 matches a value $v$ if at least one its alternatives matches $v$.
 
 ### XML Patterns

spec/08-pattern-matching.md

@@ -59,7 +59,7 @@ sequence of XML nodes (an instance of a subclass of
 `scala.Seq[scala.xml.Node]`).
 
 If an XML expression is an entity reference, CDATA section, processing
-instructions or a comments, it is represented by an instance of the
+instruction, or a comment, it is represented by an instance of the
 corresponding Scala runtime class.
 
 By default, beginning and trailing whitespace in element content is removed,

spec/10-xml-expressions-and-patterns.md

@@ -332,7 +332,7 @@ The `toString` method returns `"()"`.
 ## Standard Reference Classes
 
 This section presents some standard Scala reference classes which are
-treated in a special way in Scala compiler -- either Scala provides
+treated in a special way by the Scala compiler -- either Scala provides
 syntactic sugar for them, or the Scala compiler generates special code
 for their operations. Other classes in the standard Scala library are
 documented in the Scala library documentation by HTML pages.

spec/12-the-scala-standard-library.md

@@ -12,7 +12,7 @@ abstract class DefaultMacroCompiler extends Resolvers
   import treeInfo._
   import definitions._
   val runDefinitions = currentRun.runDefinitions
-  import runDefinitions.{Predef_???, _}
+  import runDefinitions.Predef_???
 
   val typer: global.analyzer.Typer
   val context = typer.context

src/compiler/scala/reflect/macros/compiler/DefaultMacroCompiler.scala

@@ -11,7 +11,6 @@ trait Errors extends Traces {
   import analyzer._
   import definitions._
   import treeInfo._
-  import typer.TyperErrorGen._
   import typer.infer.InferErrorGen._
   import runDefinitions._
   def globalSettings = global.settings

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

@@ -1,18 +1,12 @@
 package scala.reflect.macros
 package compiler
 
-import scala.reflect.internal.Flags._
-import scala.reflect.macros.TypecheckException
-
 trait Resolvers {
   self: DefaultMacroCompiler =>
 
   import global._
   import analyzer._
-  import definitions._
   import treeInfo._
-  import gen._
-  import runDefinitions._
 
   trait Resolver {
     self: MacroImplRefCompiler =>