Skip to content

Commit 1b09e12

Browse files
committed
Merge pull request scala#4574 from janekdb/2.11.x-typos-g-i
Fix 25 typos (g-i)
2 parents 1fbce46 + ada9fa0 commit 1b09e12

File tree

25 files changed

+25
-25
lines changed

25 files changed

+25
-25
lines changed

src/compiler/scala/reflect/quasiquotes/Reifiers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ trait Reifiers { self: Quasiquotes =>
322322
* in the domain of the fill function;
323323
*
324324
* 2. fold the groups into a sequence of lists added together with ++ using
325-
* fill reification for holeMap and fallback reification for non-holeMap.
325+
* fill reification for holeMap and fallback reification for non-holeMap.
326326
*
327327
* Example:
328328
*

src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ abstract class DeadCodeElimination extends SubComponent {
378378
} else {
379379
i match {
380380
case NEW(REFERENCE(sym)) =>
381-
log(s"Eliminated instantation of $sym inside $m")
381+
log(s"Eliminated instantiation of $sym inside $m")
382382
case STORE_LOCAL(l) if clobbers contains ((bb, idx)) =>
383383
// if an unused instruction was a clobber of a used store to a reference or array type
384384
// then we'll replace it with the store of a null to make sure the reference is

src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ abstract class ICodeReader extends ClassfileParser {
599599
}
600600
case JVM.invokedynamic =>
601601
// TODO, this is just a place holder. A real implementation must parse the class constant entry
602-
debuglog("Found JVM invokedynamic instructionm, inserting place holder ICode INVOKE_DYNAMIC.")
602+
debuglog("Found JVM invokedynamic instruction, inserting place holder ICode INVOKE_DYNAMIC.")
603603
containsInvokeDynamic = true
604604
val poolEntry = in.nextChar.toInt
605605
in.skip(2)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ trait Implicits {
985985
if (implicitInfoss.forall(_.isEmpty)) SearchFailure
986986
else new ImplicitComputation(implicitInfoss, isLocalToCallsite) findBest()
987987

988-
/** Produce an implicict info map, i.e. a map from the class symbols C of all parts of this type to
988+
/** Produce an implicit info map, i.e. a map from the class symbols C of all parts of this type to
989989
* the implicit infos in the companion objects of these class symbols C.
990990
* The parts of a type is the smallest set of types that contains
991991
* - the type itself

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ trait Infer extends Checkable {
934934
def infer_s = map3(tparams, tvars, targs)((tparam, tvar, targ) => s"$tparam=$tvar/$targ") mkString ","
935935
printTyping(tree, s"infer expr instance from pt=$pt, $infer_s")
936936

937-
// SI-7899 infering by-name types is unsound. The correct behaviour is conditional because the hole is
937+
// SI-7899 inferring by-name types is unsound. The correct behaviour is conditional because the hole is
938938
// exploited in Scalaz (Free.scala), as seen in: run/t7899-regression.
939939
def dropByNameIfStrict(tp: Type): Type = if (settings.inferByName) tp else dropByName(tp)
940940
def targsStrict = if (targs eq null) null else targs mapConserve dropByNameIfStrict

src/compiler/scala/tools/nsc/util/DocStrings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ object DocStrings {
184184
extractSectionTag(str, section) -> section
185185
}
186186

187-
/** Extract the section tag, treating the section tag as an indentifier */
187+
/** Extract the section tag, treating the section tag as an identifier */
188188
def extractSectionTag(str: String, section: (Int, Int)): String =
189189
str.substring(section._1, skipTag(str, section._1))
190190

src/library/scala/collection/generic/Sorted.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ trait Sorted[K, +This <: Sorted[K, This]] {
3636
/** Creates a ranged projection of this collection. Any mutations in the
3737
* ranged projection will update this collection and vice versa.
3838
*
39-
* Note: keys are not garuanteed to be consistent between this collection
39+
* Note: keys are not guaranteed to be consistent between this collection
4040
* and the projection. This is the case for buffers where indexing is
4141
* relative to the projection.
4242
*

src/reflect/scala/reflect/api/FlagSets.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import scala.language.implicitConversions
4848
* ''Of Note:'' This part of the Reflection API is being considered as a candidate for redesign. It is
4949
* quite possible that in future releases of the reflection API, flag sets could be replaced with something else.
5050
*
51-
* For more details about `FlagSet`s and other aspects of Scala reflection, see the
51+
* For more details about `FlagSet`s and other aspects of Scala reflection, see the
5252
* [[http://docs.scala-lang.org/overviews/reflection/overview.html Reflection Guide]]
5353
*
5454
* @group ReflectionAPI

src/reflect/scala/reflect/api/Printers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ import java.io.{ PrintWriter, StringWriter }
130130
* TermName("y")#2541#GET))
131131
* }}}
132132
*
133-
* For more details about `Printer`s and other aspects of Scala reflection, see the
133+
* For more details about `Printer`s and other aspects of Scala reflection, see the
134134
* [[http://docs.scala-lang.org/overviews/reflection/overview.html Reflection Guide]]
135135
*
136136
* @group ReflectionAPI

src/reflect/scala/reflect/internal/util/StripMarginInterpolator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trait StripMarginInterpolator {
1313
* The margin of each line is defined by whitespace leading up to a '|' character.
1414
* This margin is stripped '''before''' the arguments are interpolated into to string.
1515
*
16-
* String escape sequences are '''not''' processed; this interpolater is designed to
16+
* String escape sequences are '''not''' processed; this interpolator is designed to
1717
* be used with triple quoted Strings.
1818
*
1919
* {{{

0 commit comments

Comments
 (0)