Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 2dcc4c4

Browse files
mpociechajanekdb
authored andcommitted
Fix another several typos
I just used text search to check whether there are no more typos like these corrected by janekdb, and by the way fixed also some other ones which I saw.
1 parent ce7d2e9 commit 2dcc4c4

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4988,7 +4988,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
49884988
TypeTreeWithDeferredRefCheck(){ () =>
49894989
// wrap the tree and include the bounds check -- refchecks will perform this check (that the beta reduction was indeed allowed) and unwrap
49904990
// we can't simply use original in refchecks because it does not contains types
4991-
// (and the only typed trees we have have been mangled so they're not quite the original tree anymore)
4991+
// (and the only typed trees we have been mangled so they're not quite the original tree anymore)
49924992
checkBounds(result, tpt1.tpe.prefix, tpt1.symbol.owner, tpt1.symbol.typeParams, argtypes, "")
49934993
result // you only get to see the wrapped tree after running this check :-p
49944994
} setType (result.tpe) setPos(result.pos)

src/scaladoc/scala/tools/nsc/doc/Settings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
143143
"dot" // by default, just pick up the system-wide dot
144144
)
145145

146-
/** The maxium nuber of normal classes to show in the diagram */
146+
/** The maximum number of normal classes to show in the diagram */
147147
val docDiagramsMaxNormalClasses = IntSetting(
148148
"-diagrams-max-classes",
149149
"The maximum number of superclasses or subclasses to show in a diagram",
@@ -152,7 +152,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
152152
_ => None
153153
)
154154

155-
/** The maxium nuber of implcit classes to show in the diagram */
155+
/** The maximum number of implicit classes to show in the diagram */
156156
val docDiagramsMaxImplicitClasses = IntSetting(
157157
"-diagrams-max-implicits",
158158
"The maximum number of implicitly converted classes to show in a diagram",

src/scaladoc/scala/tools/nsc/doc/model/Entity.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ trait DocTemplateEntity extends MemberTemplateEntity {
298298
/** The shadowing information for the implicitly added members */
299299
def implicitsShadowing: Map[MemberEntity, ImplicitMemberShadowing]
300300

301-
/** Classes that can be implcitly converted to this class */
301+
/** Classes that can be implicitly converted to this class */
302302
def incomingImplicitlyConvertedClasses: List[(DocTemplateEntity, ImplicitConversion)]
303303

304304
/** Classes to which this class can be implicitly converted to

src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ trait ModelFactoryImplicitSupport {
396396

397397
def isHiddenConversion = settings.hiddenImplicits(conversionQualifiedName)
398398

399-
override def toString = "Implcit conversion from " + sym.tpe + " to " + toType + " done by " + convSym
399+
override def toString = "Implicit conversion from " + sym.tpe + " to " + toType + " done by " + convSym
400400
}
401401

402402
/* ========================= HELPER METHODS ========================== */
@@ -557,7 +557,7 @@ trait ModelFactoryImplicitSupport {
557557
*
558558
* The trick here is that the resultType does not matter - the condition for removal it that paramss have the same
559559
* structure (A => B => C may not override (A, B) => C) and that all the types involved are
560-
* of the implcit conversion's member are subtypes of the parent members' parameters */
560+
* of the implicit conversion's member are subtypes of the parent members' parameters */
561561
def isDistinguishableFrom(t1: Type, t2: Type): Boolean = {
562562
// Vlad: I tried using matches but it's not exactly what we need:
563563
// (p: AnyRef)AnyRef matches ((t: String)AnyRef returns false -- but we want that to be true

src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ trait DiagramFactory extends DiagramDirectiveParser {
5151
case p: (TemplateEntity, TypeEntity) if !classExcluded(p._1) => NormalNode(p._2, Some(p._1))()
5252
}.reverse
5353

54-
// incoming implcit conversions
54+
// incoming implicit conversions
5555
lazy val incomingImplicitNodes = tpl.incomingImplicitlyConvertedClasses.map {
5656
case (incomingTpl, conv) =>
5757
ImplicitNode(makeType(incomingTpl.sym.tpe, tpl), Some(incomingTpl))(implicitTooltip(from=incomingTpl, to=tpl, conv=conv))

test/files/neg/t2866.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ t2866.scala:42: error: ambiguous implicit values:
55
both value two of type Int
66
and value one in object A of type => Int
77
match expected type Int
8-
assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambigous in 2.7.6
8+
assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambiguous in 2.7.6
99
^
1010
t2866.scala:50: error: ambiguous implicit values:
1111
both value two of type Int

test/files/neg/t2866.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object Test {
3939
import A.one
4040
assert(implicitly[Int] == 1)
4141
implicit val two = 2
42-
assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambigous in 2.7.6
42+
assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambiguous in 2.7.6
4343
}
4444

4545
locally {

test/files/pos/t6648.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Transformer {
1010
}
1111

1212
object transformer1 extends Transformer {
13-
// Adding explicit type arguments, or making the impilcit view
13+
// Adding explicit type arguments, or making the implicit view
1414
// seqToNodeSeq explicit avoids the crash
1515
NodeSeq.foo {
1616
// These both avoid the crash:

test/scaladoc/run/implicits-base.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ object Test extends ScaladocModelTest {
9494
assert(isShadowed(conv._member("convToEnrichedA")))
9595
assert(conv._member("convToEnrichedA").resultType.name == "Double")
9696

97-
// def convToNumericA: Double // enrichA1: no constraintsd
97+
// def convToNumericA: Double // enrichA1: no constraints
9898
conv = B._conversion(A.qualifiedName + ".enrichA1")
9999
assert(conv.members.length == 1)
100100
assert(conv.constraints.length == 0)

test/scaladoc/scalacheck/HtmlFactoryTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ object Test extends Properties("HtmlFactory") {
711711

712712
property("class") = files.get("com/example/p1/Clazz.html") match {
713713
case Some(node: scala.xml.Node) => {
714-
property("implicit convertion") =
714+
property("implicit conversion") =
715715
node.toString contains "<span class=\"modifier\">implicit </span>"
716716

717717
property("gt4s") =

0 commit comments

Comments
 (0)