Skip to content

Commit

Permalink
Merge pull request scala#8966 from SethTisue/typos
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
smarter authored May 12, 2020
2 parents eeda658 + fd32c67 commit f807eee
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/SymDenotations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ object SymDenotations {
}

/** Is this a denotation of a class that does not have - either direct or inherited -
* initaliazion code?
* initialization code?
*/
def isNoInitsClass(implicit ctx: Context): Boolean =
isClass &&
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/reference/changed-features/structural-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ differences.
`Selectable` is a trait which declares the access operations.

- Two access operations, `selectDynamic` and `applyDynamic` are shared
between both approches. In `Selectable`, `applyDynamic` also takes
between both approaches. In `Selectable`, `applyDynamic` also takes
`ClassTag` indicating the method's formal parameter types. `Dynamic`
comes with `updateDynamic`.

Expand Down
6 changes: 3 additions & 3 deletions library/src/scala/Tuple.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ sealed trait Tuple extends Any {
scala.runtime.Tuple.toIArray(this)

/** Return a new tuple by prepending the element to `this` tuple.
* This opteration is O(this.size)
* This operation is O(this.size)
*/
inline def *: [H, This >: this.type <: Tuple] (x: H): H *: This =
scala.runtime.Tuple.cons(x, this).asInstanceOf[H *: This]

/** Return a new tuple by concatenating `this` tuple with `that` tuple.
* This opteration is O(this.size + that.size)
* This operation is O(this.size + that.size)
*/
inline def ++ [This >: this.type <: Tuple](that: Tuple): Concat[This, that.type] =
scala.runtime.Tuple.concat(this, that).asInstanceOf[Concat[This, that.type]]
Expand Down Expand Up @@ -200,7 +200,7 @@ sealed trait NonEmptyTuple extends Tuple {
scala.runtime.Tuple.apply(this, 0).asInstanceOf[Head[This]]

/** Get the tail of this tuple.
* This opteration is O(this.size)
* This operation is O(this.size)
*/
inline def tail[This >: this.type <: NonEmptyTuple]: Tail[This] =
scala.runtime.Tuple.tail(this).asInstanceOf[Tail[This]]
Expand Down
2 changes: 1 addition & 1 deletion tasty/src/dotty/tools/tasty/TastyFormat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Standard-Section: "ASTs" TopLevelStat*
Stat = Term
ValOrDefDef
TYPEDEF Length NameRef (type_Term | Template) Modifier* -- modifiers type name (= type | bounds) | moifiers class name template
TYPEDEF Length NameRef (type_Term | Template) Modifier* -- modifiers type name (= type | bounds) | modifiers class name template
IMPORT Length qual_Term Selector* -- import qual selectors
ValOrDefDef = VALDEF Length NameRef type_Term rhs_Term? Modifier* -- modifiers val name : type (= rhs)?
DEFDEF Length NameRef TypeParam* Params* returnType_Term
Expand Down

0 comments on commit f807eee

Please sign in to comment.