summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/typecheck/TcSimplify.hs4
-rw-r--r--rts/Capability.c2
-rw-r--r--testsuite/tests/programs/andy_cherry/DataTypes.hs2
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index 190c6c4e66..261abd0991 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -425,11 +425,11 @@ tcCheckSatisfiability :: Bag EvVar -> TcM Bool
tcCheckSatisfiability givens
= do { lcl_env <- TcM.getLclEnv
; let given_loc = mkGivenLoc topTcLevel UnkSkol lcl_env
- ; traceTc "checkSatisfiabilty {" (ppr givens)
+ ; traceTc "checkSatisfiability {" (ppr givens)
; (res, _ev_binds) <- runTcS $
do { cts <- solveSimpleGivens given_loc (bagToList givens)
; return (not (isEmptyBag cts)) }
- ; traceTc "checkSatisfiabilty }" (ppr res)
+ ; traceTc "checkSatisfiability }" (ppr res)
; return (not res) }
{-
diff --git a/rts/Capability.c b/rts/Capability.c
index b0b7f307b5..45ee2c8e30 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -859,7 +859,7 @@ yieldCapability (Capability** pCap, Task *task, rtsBool gcAllowed)
//
// - A bound thread can only be migrated by the holder of the
// Capability on which the bound thread currently lives. So, if we
-// hold Capabilty C, and task->cap == C, then task cannot be
+// hold Capability C, and task->cap == C, then task cannot be
// migrated under our feet.
// Note [migrated bound threads 2]
diff --git a/testsuite/tests/programs/andy_cherry/DataTypes.hs b/testsuite/tests/programs/andy_cherry/DataTypes.hs
index b36de838b4..bcb6cbcf60 100644
--- a/testsuite/tests/programs/andy_cherry/DataTypes.hs
+++ b/testsuite/tests/programs/andy_cherry/DataTypes.hs
@@ -508,7 +508,7 @@
data Board
= Board (Array BoardPos BoardSquare)
MoveNumber -- current player & and move
- (Maybe ChessFile) -- e.p. possibilties.
+ (Maybe ChessFile) -- e.p. possibilities.