diff options
16 files changed, 5 insertions, 38 deletions
diff --git a/testsuite/tests/arrows/should_fail/T2111.hs b/testsuite/tests/arrows/should_fail/T2111.hs index eb242cdd6b..352afe2abe 100644 --- a/testsuite/tests/arrows/should_fail/T2111.hs +++ b/testsuite/tests/arrows/should_fail/T2111.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -XArrows -XDoRec -XRecursiveDo#-} +{-# OPTIONS_GHC -XArrows -XRecursiveDo#-} -- Test Trac #2111 module Foo where diff --git a/testsuite/tests/arrows/should_fail/T2111.stderr b/testsuite/tests/arrows/should_fail/T2111.stderr index 9c6c17fb53..73f5dad967 100644 --- a/testsuite/tests/arrows/should_fail/T2111.stderr +++ b/testsuite/tests/arrows/should_fail/T2111.stderr @@ -1,7 +1,4 @@ -T2111.hs:1:16: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead - T2111.hs:6:23: The arrow command undefined -< x diff --git a/testsuite/tests/deSugar/should_compile/T3263-1.stderr b/testsuite/tests/deSugar/should_compile/T3263-1.stderr index ac21515daf..6f3a280214 100644 --- a/testsuite/tests/deSugar/should_compile/T3263-1.stderr +++ b/testsuite/tests/deSugar/should_compile/T3263-1.stderr @@ -1,7 +1,4 @@ -on the commandline: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead - T3263-1.hs:25:3: Warning: A do-notation statement discarded a result of type Int. Suppress this warning by saying "_ <- nonNullM", diff --git a/testsuite/tests/deSugar/should_compile/T3263-2.stderr b/testsuite/tests/deSugar/should_compile/T3263-2.stderr index 3f92403e84..6caae87893 100644 --- a/testsuite/tests/deSugar/should_compile/T3263-2.stderr +++ b/testsuite/tests/deSugar/should_compile/T3263-2.stderr @@ -1,7 +1,4 @@ -on the commandline: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead - T3263-2.hs:25:3: Warning: A do-notation statement discarded a result of type m Int. Suppress this warning by saying "_ <- return (return 10 :: m Int)", diff --git a/testsuite/tests/ghci.debugger/scripts/break018.stderr b/testsuite/tests/ghci.debugger/scripts/break018.stderr deleted file mode 100644 index d0bb1e0d0a..0000000000 --- a/testsuite/tests/ghci.debugger/scripts/break018.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -<no location info>: Warning: - -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr deleted file mode 100644 index d0bb1e0d0a..0000000000 --- a/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -<no location info>: Warning: - -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/mdo/should_compile/mdo006.stderr b/testsuite/tests/mdo/should_compile/mdo006.stderr deleted file mode 100644 index 218ba444b8..0000000000 --- a/testsuite/tests/mdo/should_compile/mdo006.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -mdo006.hs:1:12: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/mdo/should_fail/all.T b/testsuite/tests/mdo/should_fail/all.T index 6693587bab..667a538ce1 100644 --- a/testsuite/tests/mdo/should_fail/all.T +++ b/testsuite/tests/mdo/should_fail/all.T @@ -5,3 +5,4 @@ test('mdofail002', normal, compile_fail, ['']) test('mdofail003', normal, compile_fail, ['']) test('mdofail004', normal, compile, ['']) test('mdofail005', normal, compile_fail, ['']) +test('mdofail006', exit_code(1), compile_and_run, ['']) diff --git a/testsuite/tests/mdo/should_fail/mdofail001.stderr b/testsuite/tests/mdo/should_fail/mdofail001.stderr index f9516ad2b0..e20d82ad49 100644 --- a/testsuite/tests/mdo/should_fail/mdofail001.stderr +++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr @@ -1,7 +1,4 @@ -mdofail001.hs:1:12:
- Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
mdofail001.hs:10:32:
No instance for (Num Char)
arising from the literal `1'
diff --git a/testsuite/tests/mdo/should_fail/mdofail002.stderr b/testsuite/tests/mdo/should_fail/mdofail002.stderr index 4da766311e..a1327c6dfd 100644 --- a/testsuite/tests/mdo/should_fail/mdofail002.stderr +++ b/testsuite/tests/mdo/should_fail/mdofail002.stderr @@ -1,7 +1,4 @@ -mdofail002.hs:1:12: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead - mdofail002.hs:10:9: Conflicting definitions for `x' Bound at: mdofail002.hs:10:9 diff --git a/testsuite/tests/mdo/should_fail/mdofail003.stderr b/testsuite/tests/mdo/should_fail/mdofail003.stderr index fceb7d2b82..e093fe0a75 100644 --- a/testsuite/tests/mdo/should_fail/mdofail003.stderr +++ b/testsuite/tests/mdo/should_fail/mdofail003.stderr @@ -1,7 +1,4 @@ -mdofail003.hs:1:12: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead - mdofail003.hs:10:9: Conflicting definitions for `x' Bound at: mdofail003.hs:10:9 diff --git a/testsuite/tests/mdo/should_fail/mdofail004.stderr b/testsuite/tests/mdo/should_fail/mdofail004.stderr deleted file mode 100644 index 7a96d65197..0000000000 --- a/testsuite/tests/mdo/should_fail/mdofail004.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -mdofail004.hs:1:12: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/mdo/should_run/all.T b/testsuite/tests/mdo/should_run/all.T index 53730bebe6..3c952228a7 100644 --- a/testsuite/tests/mdo/should_run/all.T +++ b/testsuite/tests/mdo/should_run/all.T @@ -3,3 +3,5 @@ setTestOpts(only_ways(['normal'])); test('mdorun001', normal, compile_and_run, ['']) test('mdorun002', normal, compile_and_run, ['']) test('mdorun003', normal, compile_and_run, ['']) +test('mdorun004', normal, compile_and_run, ['']) +test('mdorun005', normal, compile_and_run, ['']) diff --git a/testsuite/tests/parser/should_compile/read058.stderr b/testsuite/tests/parser/should_compile/read058.stderr deleted file mode 100644 index aa42286c89..0000000000 --- a/testsuite/tests/parser/should_compile/read058.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -read058.hs:2:16: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/parser/should_compile/read059.stderr b/testsuite/tests/parser/should_compile/read059.stderr deleted file mode 100644 index 5d2ae6c397..0000000000 --- a/testsuite/tests/parser/should_compile/read059.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -read059.hs:2:14: - Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead diff --git a/testsuite/tests/typecheck/should_compile/T4404.hs b/testsuite/tests/typecheck/should_compile/T4404.hs index 894066542a..1b46a158fb 100644 --- a/testsuite/tests/typecheck/should_compile/T4404.hs +++ b/testsuite/tests/typecheck/should_compile/T4404.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE RecordWildCards, DoRec #-} +{-# LANGUAGE RecordWildCards, RecursiveDo #-} module TT where |