diff options
Diffstat (limited to 'testsuite/tests/safeHaskell')
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check06.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check06_A.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check07_A.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check07_B.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check08_A.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check08_B.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags21.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags22.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags23.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags24.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags25.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/flags/SafeFlags26.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/safeInfered/all.T | 4 |
15 files changed, 16 insertions, 16 deletions
diff --git a/testsuite/tests/safeHaskell/check/Check06.hs b/testsuite/tests/safeHaskell/check/Check06.hs index a4debfc2cb..99649fa079 100644 --- a/testsuite/tests/safeHaskell/check/Check06.hs +++ b/testsuite/tests/safeHaskell/check/Check06.hs @@ -1,7 +1,7 @@ {-# LANGUAGE Trustworthy, NoImplicitPrelude #-} {-# OPTIONS_GHC -fpackage-trust #-} --- make sure importing a safe-infered module brings in the +-- make sure importing a safe-inferred module brings in the -- pkg trust requirements correctly. module Check06 ( main' ) where diff --git a/testsuite/tests/safeHaskell/check/Check06_A.hs b/testsuite/tests/safeHaskell/check/Check06_A.hs index 9c9d92ba24..4cda329fec 100644 --- a/testsuite/tests/safeHaskell/check/Check06_A.hs +++ b/testsuite/tests/safeHaskell/check/Check06_A.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check06_A where mainM :: Int -> Int diff --git a/testsuite/tests/safeHaskell/check/Check07_A.hs b/testsuite/tests/safeHaskell/check/Check07_A.hs index 5b38c6a07b..efc58e0bfe 100644 --- a/testsuite/tests/safeHaskell/check/Check07_A.hs +++ b/testsuite/tests/safeHaskell/check/Check07_A.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} --- safe infered, with no pkg trust reqs +-- safe inferred, with no pkg trust reqs module Check07_A where a :: a -> a diff --git a/testsuite/tests/safeHaskell/check/Check07_B.hs b/testsuite/tests/safeHaskell/check/Check07_B.hs index 4a2003f9a9..5085cc18ab 100644 --- a/testsuite/tests/safeHaskell/check/Check07_B.hs +++ b/testsuite/tests/safeHaskell/check/Check07_B.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check07_B where import Prelude diff --git a/testsuite/tests/safeHaskell/check/Check08_A.hs b/testsuite/tests/safeHaskell/check/Check08_A.hs index c888a59b71..4438a34e09 100644 --- a/testsuite/tests/safeHaskell/check/Check08_A.hs +++ b/testsuite/tests/safeHaskell/check/Check08_A.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} --- safe infered, with no pkg trust reqs +-- safe inferred, with no pkg trust reqs module Check08_A where a :: a -> a diff --git a/testsuite/tests/safeHaskell/check/Check08_B.hs b/testsuite/tests/safeHaskell/check/Check08_B.hs index 41feab5eae..42d01f2b33 100644 --- a/testsuite/tests/safeHaskell/check/Check08_B.hs +++ b/testsuite/tests/safeHaskell/check/Check08_B.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check08_B where import Prelude diff --git a/testsuite/tests/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T index 47e875d3be..8cf37d3b43 100644 --- a/testsuite/tests/safeHaskell/check/all.T +++ b/testsuite/tests/safeHaskell/check/all.T @@ -41,7 +41,7 @@ test('Check04', normal, multi_compile, ['Check04', [ # Check -fpackage-trust with no safe haskell flag is an error test('Check05', normal, compile, ['']) -# Check safe-infered modules have correct pkg trust requirements +# Check safe-inferred modules have correct pkg trust requirements test('Check06', [], multimod_compile_fail, ['Check06', '']) # Check selective safe imports bring in correct pkg trust requirements diff --git a/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs index a4b7390352..75bde26b4e 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs +++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs @@ -1,6 +1,6 @@ -- safe inference -- same module as M_SafePkg4 which compiles with -XSafe. --- Want to make sure compiles fine and is infered safe and +-- Want to make sure compiles fine and is inferred safe and -- also picks up corrected pkg trust requirements. module M_SafePkg5 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags21.hs b/testsuite/tests/safeHaskell/flags/SafeFlags21.hs index c7e8b0d87a..5169a03583 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags21.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags21.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-unsafe #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered unsafe +-- Warn if module is inferred unsafe -- In this test the warning _shouldn't_ fire module SafeFlags21 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags22.hs b/testsuite/tests/safeHaskell/flags/SafeFlags22.hs index 0b94cff91c..3d5d8dc1af 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags22.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags22.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-unsafe #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered unsafe +-- Warn if module is inferred unsafe -- In this test the warning _should_ fire module SafeFlags22 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags23.hs b/testsuite/tests/safeHaskell/flags/SafeFlags23.hs index 87f7b2dc5d..b3180bc1e1 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags23.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags23.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-unsafe -Werror #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered unsafe +-- Warn if module is inferred unsafe -- In this test the warning _should_ fire and cause a compile fail module SafeFlags22 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags24.hs b/testsuite/tests/safeHaskell/flags/SafeFlags24.hs index 928d322e3c..ab63880f80 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags24.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags24.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-safe #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered safe +-- Warn if module is inferred safe -- In this test the warning _shouldn't_ fire module SafeFlags23 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags25.hs b/testsuite/tests/safeHaskell/flags/SafeFlags25.hs index c97fa885d1..7d650d6a72 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags25.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags25.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-safe #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered safe +-- Warn if module is inferred safe -- In this test the warning _should_ fire module SafeFlags25 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags26.hs b/testsuite/tests/safeHaskell/flags/SafeFlags26.hs index 0767448bca..45b65f3d9e 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags26.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags26.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-safe -Werror #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered safe +-- Warn if module is inferred safe -- In this test the warning _should_ fire and cause a compile fail module SafeFlags26 where diff --git a/testsuite/tests/safeHaskell/safeInfered/all.T b/testsuite/tests/safeHaskell/safeInfered/all.T index be38d8ff12..e9b03b5458 100644 --- a/testsuite/tests/safeHaskell/safeInfered/all.T +++ b/testsuite/tests/safeHaskell/safeInfered/all.T @@ -7,14 +7,14 @@ def f( name, opts ): setTestOpts(f) -# Tests that should compile fine as they should be infered safe +# Tests that should compile fine as they should be inferred safe test('SafeInfered01', [], multimod_compile, ['SafeInfered01', '']) test('SafeInfered02', [], multimod_compile, ['SafeInfered02', '']) test('SafeInfered03', [], multimod_compile, ['SafeInfered03', '']) test('SafeInfered04', [], multimod_compile, ['SafeInfered04', '']) test('SafeInfered05', [], multimod_compile, ['SafeInfered05', '']) -# Tests that should fail to compile as they should be infered unsafe +# Tests that should fail to compile as they should be inferred unsafe test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', '']) test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', '']) test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', '']) |