Skip to content

Commit

Permalink
Merge pull request scala#15484 from Jentsch/spelling
Browse files Browse the repository at this point in the history
Fix some spelling mistakes
  • Loading branch information
bishabosha authored Jun 20, 2022
2 parents 58d94d2 + 94d0d48 commit b2cf192
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
5 changes: 1 addition & 4 deletions compiler/src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -987,10 +987,7 @@ object Types {
(name, buf) => buf += member(name).asSingleDenotation)
}

/** The set of implicit term members of this type
* @param kind A subset of {Implicit, Given} that specifies what kind of implicit should
* be returned
*/
/** The set of implicit term members of this type */
final def implicitMembers(using Context): List[TermRef] = {
record("implicitMembers")
memberDenots(implicitFilter,
Expand Down
10 changes: 5 additions & 5 deletions compiler/src/dotty/tools/dotc/typer/Applications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ trait Applications extends Compatibility {
* type by means of a type ascription, as long as the widened type is
* still compatible with the expected type.
* The underlying type is the intersection of all class parents of the
* orginal type.
* original type.
*/
def widenEnumCase(tree: Tree, pt: Type)(using Context): Tree =
val sym = tree.symbol
Expand Down Expand Up @@ -1259,7 +1259,7 @@ trait Applications extends Compatibility {
* whereas overloaded variants need to have a conforming variant.
*/
def trySelectUnapply(qual: untpd.Tree)(fallBack: (Tree, TyperState) => Tree): Tree = {
// try first for non-overloaded, then for overloaded ocurrences
// try first for non-overloaded, then for overloaded occurrences
def tryWithName(name: TermName)(fallBack: (Tree, TyperState) => Tree)(using Context): Tree =

def tryWithProto(qual: untpd.Tree, targs: List[Tree], pt: Type)(using Context) =
Expand Down Expand Up @@ -2080,7 +2080,7 @@ trait Applications extends Compatibility {
mappedSym.rawParamss = alt.symbol.rawParamss
// we need rawParamss to find parameters with default arguments,
// but we do not need to be precise right now, since this is just a pre-test before
// we look up defult getters. If at some point we extract default arguments from the
// we look up default getters. If at some point we extract default arguments from the
// parameter symbols themselves, we have to find the right parameter by name, not position.
// That means it's OK to copy parameters wholesale rather than tailoring them to always
// correspond to the type transformation.
Expand Down Expand Up @@ -2203,7 +2203,7 @@ trait Applications extends Compatibility {
* This reset is needed because otherwise the original results might
* have added constraints to type parameters which are no longer
* implied after harmonization. No essential constraints are lost by this because
* the result of harmomization will be compared again with the expected type.
* the result of harmonization will be compared again with the expected type.
* Test cases where this matters are in pos/harmomize.scala.
*/
def harmonic[T](harmonize: List[T] => List[T], pt: Type)(op: => List[T])(using Context): List[T] =
Expand Down Expand Up @@ -2262,7 +2262,7 @@ trait Applications extends Compatibility {
* with the type parameters of the extension (T1, T2) inferred.
* None is returned if the implicit search fails for any of the leading implicit parameters
* or if the receiver has a wrong type (note that in general the type of the receiver
* might depend on the exact types of the found instances of the proceding implicits).
* might depend on the exact types of the found instances of the proceeding implicits).
* No implicit search is tried for implicits following the receiver or for parameters of the def (D, E).
*/
def tryApplyingExtensionMethod(methodRef: TermRef, receiver: Tree)(using Context): Option[Tree] =
Expand Down

0 comments on commit b2cf192

Please sign in to comment.