Merge pull request swiftlang#1555 from kevinwcyu/fix-typos-whitespaces

[gardening] Fix typos "cant" → "can't", "dont" → "don't".
GiorgioRegni · Mar 6, 2016 · 50f8abe · 50f8abe
2 parents 449869c + 8f193c8
commit 50f8abe
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -490,7 +490,7 @@ ERROR(sil_member_decl_not_found,none,
 ERROR(sil_member_decl_type_mismatch,none,
       "member defined with mismatching type %0 (expected %1)", (Type, Type))
 ERROR(sil_substitution_mismatch,none,
-      "substitution conformances dont match archetype", ())
+      "substitution conformances don't match archetype", ())
 ERROR(sil_missing_substitutions,none,
       "missing substitutions", ())
 ERROR(sil_too_many_substitutions,none,

diff --git a/lib/SIL/SILValueProjection.cpp b/lib/SIL/SILValueProjection.cpp
@@ -314,7 +314,7 @@ void LSLocation::enumerateLSLocation(SILModule *M, SILValue Mem,
   SILValue UO = getUnderlyingObject(Mem);
   LSLocation L(UO, ProjectionPath::getProjectionPath(UO, Mem));
 
-  // If we cant figure out the Base or Projection Path for the memory location,
+  // If we can't figure out the Base or Projection Path for the memory location,
   // simply ignore it for now.
   if (!L.isValid())
     return;

diff --git a/lib/SILOptimizer/Transforms/DeadStoreElimination.cpp b/lib/SILOptimizer/Transforms/DeadStoreElimination.cpp
@@ -732,7 +732,7 @@ void DSEContext::invalidateLSLocationBase(SILInstruction *I, DSEKind Kind) {
 }
 
 void DSEContext::processReadForDSE(BlockState *S, unsigned bit) {
-  // Remove any may/must-aliasing stores to the LSLocation, as they cant be
+  // Remove any may/must-aliasing stores to the LSLocation, as they can't be
   // used to kill any upward visible stores due to the interfering load.
   LSLocation &R = LocationVault[bit];
   for (unsigned i = 0; i < S->LocationNum; ++i) {
@@ -788,7 +788,7 @@ void DSEContext::processRead(SILInstruction *I, BlockState *S, SILValue Mem,
     L = LSLocation(UO, ProjectionPath::getProjectionPath(UO, Mem));
   }
 
-  // If we cant figure out the Base or Projection Path for the read instruction,
+  // If we can't figure out the Base or Projection Path for the read instruction,
   // process it as an unknown memory instruction for now.
   if (!L.isValid()) {
     processUnknownReadInst(I, Kind);
@@ -873,7 +873,7 @@ void DSEContext::processWrite(SILInstruction *I, BlockState *S, SILValue Val,
     L = LSLocation(UO, ProjectionPath::getProjectionPath(UO, Mem));
   }
 
-  // If we cant figure out the Base or Projection Path for the store
+  // If we can't figure out the Base or Projection Path for the store
   // instruction, simply ignore it.
   if (!L.isValid())
     return;

diff --git a/lib/SILOptimizer/Transforms/RedundantLoadElimination.cpp b/lib/SILOptimizer/Transforms/RedundantLoadElimination.cpp
@@ -804,7 +804,7 @@ void BlockState::processWrite(RLEContext &Ctx, SILInstruction *I, SILValue Mem,
     L = LSLocation(UO, ProjectionPath::getProjectionPath(UO, Mem));
   }
 
-  // If we cant figure out the Base or Projection Path for the write,
+  // If we can't figure out the Base or Projection Path for the write,
   // process it as an unknown memory instruction.
   if (!L.isValid()) {
     // we can ignore unknown store instructions if we are computing the
@@ -861,7 +861,7 @@ void BlockState::processRead(RLEContext &Ctx, SILInstruction *I, SILValue Mem,
     L = LSLocation(UO, ProjectionPath::getProjectionPath(UO, Mem));
   }
 
-  // If we cant figure out the Base or Projection Path for the read, simply
+  // If we can't figure out the Base or Projection Path for the read, simply
   // ignore it for now.
   if (!L.isValid())
     return;

diff --git a/test/SILOptimizer/dead_alloc_elim.sil b/test/SILOptimizer/dead_alloc_elim.sil
@@ -101,7 +101,7 @@ sil @trivial_destructor_store_into : $@convention(thin) () -> () {
   return %4 : $()
 }
 
-// We store a pointer from the alloc_ref, dont do anything!
+// We store a pointer from the alloc_ref, don't do anything!
 //
 // CHECK-LABEL: sil @trivial_destructor_store_ptr
 // CHECK: bb0

diff --git a/test/SILOptimizer/dead_store_elim.sil b/test/SILOptimizer/dead_store_elim.sil
@@ -406,7 +406,7 @@ bb3:
 }
 
 // We should be able to remove the store in bb0, but we currently
-// cant due to deficiency in alias analysis.
+// can't due to deficiency in alias analysis.
 //
 // CHECK-LABEL: DeadStoreWithAliasingBasesSimpleClass
 // CHECK: bb0([[RET0:%.+]] : $Bool):

diff --git a/test/attr/attr_availability.swift b/test/attr/attr_availability.swift
@@ -25,7 +25,7 @@ func unavailable_bad_platform() {}
 func availabilityUnknownPlatform() {}
 
 // <rdar://problem/17669805> Availability can't appear on a typealias
-@available(*, unavailable, message="oh no you dont")
+@available(*, unavailable, message="oh no you don't")
 typealias int = Int // expected-note {{'int' has been explicitly marked unavailable here}}
 
 @available(*, unavailable, renamed="Float")
@@ -42,7 +42,7 @@ extension MyCollection {
   func append(element: T) { } // expected-error {{'T' has been renamed to 'Element'}} {{24-25=Element}}
 }
 
-var x : int // expected-error {{'int' is unavailable: oh no you dont}}
+var x : int // expected-error {{'int' is unavailable: oh no you don't}}
 var y : float // expected-error {{'float' has been renamed to 'Float'}}{{9-14=Float}}
 
 // Encoded message

diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -434,7 +434,7 @@ swift-sdks=OSX
 swift-primary-variant-sdk=OSX
 swift-primary-variant-arch=x86_64
 
-# Dont build the benchmarks
+# Don't build the benchmarks
 skip-build-benchmarks=1
 
 [preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]