diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | project/MiMa.scala | 2 | ||||
| -rw-r--r-- | spec/06-expressions.md | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/TailCalls.scala | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -668,7 +668,7 @@ lazy val test = project (baseDir / "test/files/lib").list.toSeq.filter(_.endsWith(".jar.desired.sha1")) .map(f => bootstrapDep(baseDir, "test/files/lib", f.dropRight(17))) }, - // Two hardcoded depenencies in partest, resolved in the otherwise unused scope "test": + // Two hardcoded dependencies in partest, resolved in the otherwise unused scope "test": libraryDependencies += bootstrapDep((baseDirectory in ThisBuild).value, "test/files/codelib", "code") % "test", libraryDependencies += bootstrapDep((baseDirectory in ThisBuild).value, "test/files/speclib", "instrumented") % "test", // no main sources diff --git a/project/MiMa.scala b/project/MiMa.scala index fb9bb175ab..a47856b1fd 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -51,7 +51,7 @@ object MiMa { "--curr", curr.getAbsolutePath, "--filters", filter.getAbsolutePath, "--generate-filters", - // !!! Command line MiMa (which we call rathan the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly + // !!! Command line MiMa (which we call rather than the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly // defaults to no checking (!) if this isn't specified. Fixed in https://github.com/typesafehub/migration-manager/pull/138 // TODO: Try out the new "--direction both" mode of MiMa "--direction", "backwards" diff --git a/spec/06-expressions.md b/spec/06-expressions.md index 581170c5f9..0e84c427f6 100644 --- a/spec/06-expressions.md +++ b/spec/06-expressions.md @@ -455,7 +455,7 @@ $e$. Type applications can be omitted if [local type inference](#local-type-inference) can infer best type parameters -for a polymorphic functions from the types of the actual function arguments +for a polymorphic function from the types of the actual function arguments and the expected result type. ## Tuples diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala index 744b9c8a8e..9e3e8ff455 100644 --- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala +++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala @@ -84,7 +84,7 @@ abstract class TailCalls extends Transform { * </p> * <p> * Assumes: `Uncurry` has been run already, and no multiple - * parameter lists exit. + * parameter lists exist. * </p> */ class TailCallElimination(unit: CompilationUnit) extends Transformer { |