Skip to content

Commit 8beed12

Browse files
committed
Merge pull request scala#4605 from janekdb/2.11.x-typos-s
Fix 25 typos (s) - LGTM - thanks, smiles
2 parents 8d119e6 + d2199c5 commit 8beed12

File tree

18 files changed

+24
-24
lines changed

18 files changed

+24
-24
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ trait Reifiers { self: Quasiquotes =>
317317
* Reification of non-trivial list is done in two steps:
318318
*
319319
* 1. split the list into groups where every placeholder is always
320-
* put in a group of its own and all subsquent non-holeMap are
320+
* put in a group of its own and all subsequent non-holeMap are
321321
* grouped together; element is considered to be a placeholder if it's
322322
* in the domain of the fill function;
323323
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
233233
}
234234

235235
/** Return the synchronized part of the double-checked locking idiom around the syncBody tree. It guards with `cond` and
236-
* synchronizez on `clazz.this`. Additional statements can be included after initialization,
236+
* synchronizes on `clazz.this`. Additional statements can be included after initialization,
237237
* (outside the synchronized block).
238238
*
239239
* The idiom works only if the condition is using a volatile field.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ trait Implicits {
846846
errors.collectFirst { case err: DivergentImplicitTypeError => err } foreach saveDivergent
847847

848848
if (search.isDivergent && divergentError.isEmpty) {
849-
// Divergence triggered by `i` at this level of the implicit serach. We haven't
849+
// Divergence triggered by `i` at this level of the implicit search. We haven't
850850
// seen divergence so far, we won't issue this error just yet, and instead temporarily
851851
// treat `i` as a failed candidate.
852852
saveDivergent(DivergentImplicitTypeError(tree, pt, i.sym))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ trait MethodSynthesis {
436436
if (tree.symbol.owner.isTrait || hasUnitType(basisSym)) rhs1
437437
else gen.mkAssignAndReturn(basisSym, rhs1)
438438
)
439-
derivedSym setPos tree.pos // cannot set it at createAndEnterSymbol because basisSym can possible stil have NoPosition
439+
derivedSym setPos tree.pos // cannot set it at createAndEnterSymbol because basisSym can possibly still have NoPosition
440440
val ddefRes = DefDef(derivedSym, new ChangeOwnerAndModuleClassTraverser(basisSym, derivedSym)(body))
441441
// ValDef will have its position focused whereas DefDef will have original correct rangepos
442442
// ideally positions would be correct at the creation time but lazy vals are really a special case

src/reflect/scala/reflect/internal/Definitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ trait Definitions extends api.StandardDefinitions {
103103
def isNumericValueClass(sym: Symbol) = ScalaNumericValueClasses contains sym
104104

105105
def isGetClass(sym: Symbol) = (
106-
sym.name == nme.getClass_ // this condition is for performance only, this is called from `Typer#stabliize`.
106+
sym.name == nme.getClass_ // this condition is for performance only, this is called from `Typer#stabilize`.
107107
&& getClassMethods(sym)
108108
)
109109

src/reflect/scala/reflect/internal/StdNames.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ trait StdNames {
870870
val toFloat: NameType = "toFloat"
871871
val toDouble: NameType = "toDouble"
872872

873-
// primitive operation methods for structual types mostly
873+
// primitive operation methods for structural types mostly
874874
// overlap with the above, but not for these two.
875875
val toCharacter: NameType = "toCharacter"
876876
val toInteger: NameType = "toInteger"

src/reflect/scala/reflect/runtime/SynchronizedTypes.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ private[reflect] trait SynchronizedTypes extends internal.Types { self: SymbolTa
8282
override def toStringSubjects = _toStringSubjects.get
8383

8484
/* The idea of caches is as follows.
85-
* When in reflexive mode, a cache is either null, or one sentinal
85+
* When in reflexive mode, a cache is either null, or one sentinel
8686
* value representing undefined or the final defined
87-
* value. Hence, we can ask in non-synchronized ode whether the cache field
87+
* value. Hence, we can ask in non-synchronized mode whether the cache field
8888
* is non null and different from the sentinel (if a sentinel exists).
8989
* If that's true, the cache value is current.
9090
* Otherwise we arrive in one of the defined... methods listed below

src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import scala.tools.nsc.interpreter
1515
import scala.tools.nsc.interpreter.session.{History, SimpleHistory}
1616

1717

18-
/** A straight scalification of the jline interface which mixes
18+
/** A straight scalafication of the jline interface which mixes
1919
* in the sparse jline-independent one too.
2020
*/
2121
trait JLineHistory extends JHistory with History {

test/disabled/presentation/akka/src/akka/actor/ActorRef.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef =>
13841384
"\n\tYou have probably: " +
13851385
"\n\t\t1. Sent a message to an Actor from an instance that is NOT an Actor." +
13861386
"\n\t\t2. Invoked a method on an TypedActor from an instance NOT an TypedActor." +
1387-
"\n\tElse you might want to use 'reply_?' which returns Boolean(true) if succes and Boolean(false) if no sender in scope")
1387+
"\n\tElse you might want to use 'reply_?' which returns Boolean(true) if success and Boolean(false) if no sender in scope")
13881388

13891389
/**
13901390
* Use <code>reply_?(..)</code> to reply with a message to the original sender of the message currently

test/files/pos/t6601/UsePrivateValueClass_2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object Test {
2-
// After the first attempt to make seprately compiled value
2+
// After the first attempt to make separately compiled value
33
// classes respect the privacy of constructors, we got:
44
//
55
// exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply

0 commit comments

Comments
 (0)