Skip to content

Commit 425f521

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents 1cb219e + 5dd244c commit 425f521

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

SwiftCompilerSources/Sources/AST/Type.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Basic
1414
import ASTBridging
1515

1616
/// A Swift type.
17-
/// It is not necessarily canoncial, e.g. typealiases are not resolved.
17+
/// It is not necessarily canonical, e.g. typealiases are not resolved.
1818
public struct Type: TypeProperties, CustomStringConvertible, NoReflectionChildren {
1919
public enum TraitResult {
2020
case isNot
@@ -206,7 +206,7 @@ extension TypeProperties {
206206
rawType.bridged.getNominalOrBoundGenericNominal().getAs(NominalTypeDecl.self)
207207
}
208208

209-
/// Performas a global conformance lookup for this type for `protocol`.
209+
/// Performs a global conformance lookup for this type for `protocol`.
210210
/// It checks conditional requirements.
211211
///
212212
/// This type must be a contextualized type. It must not contain type parameters.

0 commit comments

Comments
 (0)