From 80560e69ca40abb2c94c4e9fa322365f558a6a8b Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Mon, 23 Jan 2017 09:38:15 +0100 Subject: Typos and grammar in manual/comments --- testsuite/tests/deriving/should_fail/drvfail-functor2.hs | 2 +- testsuite/tests/printer/Ppr006.hs | 2 +- testsuite/tests/safeHaskell/overlapping/SH_Overlap8.hs | 2 +- testsuite/tests/typecheck/should_compile/T4361.hs | 2 +- testsuite/tests/typecheck/should_fail/tcfail143.hs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'testsuite') diff --git a/testsuite/tests/deriving/should_fail/drvfail-functor2.hs b/testsuite/tests/deriving/should_fail/drvfail-functor2.hs index 7198755b80..77e17cf381 100644 --- a/testsuite/tests/deriving/should_fail/drvfail-functor2.hs +++ b/testsuite/tests/deriving/should_fail/drvfail-functor2.hs @@ -14,7 +14,7 @@ newtype OnSecondArg a = OnSecondArg (Either a a) newtype NoArguments = NoArguments Int deriving (Functor) --- Derive Functor on a type with extra stupid-contraints on 'a' +-- Derive Functor on a type with extra stupid-constraints on 'a' data Eq a => StupidConstraint a = StupidType a deriving (Functor) diff --git a/testsuite/tests/printer/Ppr006.hs b/testsuite/tests/printer/Ppr006.hs index 280ec564b4..8765860981 100644 --- a/testsuite/tests/printer/Ppr006.hs +++ b/testsuite/tests/printer/Ppr006.hs @@ -191,7 +191,7 @@ commands = [ -- Library: add song to playlist and play it -- Browse: either add song to playlist and play it, or :move-in , command "default-action" [help| - depending on the item under the cursor, somthing different happens: + depending on the item under the cursor, something different happens: - *Playlist* start playing the song under the cursor diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.hs b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.hs index 6523193db3..6026769941 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.hs +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleInstances #-} -- | Overlapping instances, but with a single parameter type-class and no --- orphans. So `SH_Overlap8` decided to explictly depend on `SH_Overlap8_A` +-- orphans. So `SH_Overlap8` decided to explicitly depend on `SH_Overlap8_A` -- since that's where the type-class `C` with function `f` is defined. -- -- Question: Safe or Unsafe? Safe diff --git a/testsuite/tests/typecheck/should_compile/T4361.hs b/testsuite/tests/typecheck/should_compile/T4361.hs index b61e763488..ac04f40407 100644 --- a/testsuite/tests/typecheck/should_compile/T4361.hs +++ b/testsuite/tests/typecheck/should_compile/T4361.hs @@ -22,7 +22,7 @@ moduloBasisx p = let x :: () x = upLinSolvRing p in () - -- This is very delicate! The contraint (LinSolvRing (Pol a)) + -- This is very delicate! The constraint (LinSolvRing (Pol a)) -- arises in the RHS of x, and we must be careful *not* to simplify -- it with the instance declaration "XXXX", else we get the -- unsatisfiable constraint (EuclideanRing a). In effect, the diff --git a/testsuite/tests/typecheck/should_fail/tcfail143.hs b/testsuite/tests/typecheck/should_fail/tcfail143.hs index f0ee21f352..55b45eca31 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail143.hs +++ b/testsuite/tests/typecheck/should_fail/tcfail143.hs @@ -86,7 +86,7 @@ changes the order. Hmm. Perhaps a good improvement strategy would be: - - first do improvement against the instance declartions + - first do improvement against the instance declarations - and only then do pairwise improvement between constraints I've implemented that, and indeed it improves the result. -- cgit v1.2.1