testsuite: Update Win32 test output for GHC2021

Fixes the Windows CI jobs. Requires update of the Win32 submodule.

4 files changed, 5 insertions, 28 deletions

diff --git a/testsuite/tests/ghci/scripts/T9293.stdout-mingw32 b/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
index 5b5898373f..b62a76b18e 100644
--- a/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
@@ -1,8 +1,6 @@
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -19,11 +17,9 @@ Should fail, GADTs is not enabled
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XGADTSyntax
   -XGADTs
   -XMonoLocalBinds
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -40,10 +36,8 @@ Should work, GADTs is in force from :set
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XGADTSyntax
   -XMonoLocalBinds
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -59,13 +53,11 @@ warning settings:
 Should fail, GADTs is now disabled
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XExtendedDefaultRules
   -XGADTSyntax
   -XGADTs
   -XMonoLocalBinds
   -XNoMonomorphismRestriction
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
index 72ebb6b1b8..5a6d495c04 100644
--- a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
@@ -1,9 +1,7 @@
 ~~~~~~~~~~ Testing :set
 options currently set: none.
-base language is: Haskell2010
+base language is: GHC2021
 with the following modifiers:
-  -XNoDatatypeContexts
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -18,7 +16,7 @@ warning settings:
   -Wcompat-unqualified-imports
 ~~~~~~~~~~ Testing :set -a
 options currently set: none.
-base language is: Haskell2010
+base language is: GHC2021
 all active language options:
 GHCi-specific dynamic flag settings:
   -fno-print-explicit-foralls
@@ -26,16 +24,12 @@ other dynamic, non-language, flag settings:
 warning settings:
   -Wno-implicit-prelude
 ~~~~~~~~~~ Testing :show languages
-base language is: Haskell2010
+base language is: GHC2021
 with the following modifiers:
-  -XNoDatatypeContexts
-  -XNondecreasingIndentation
 ~~~~~~~~~~ Testing :show languages, with -XMagicHash
-base language is: Haskell2010
+base language is: GHC2021
 with the following modifiers:
-  -XNoDatatypeContexts
   -XMagicHash
-  -XNondecreasingIndentation
 ~~~~~~~~~~ Testing :show packages
 active package flags: none
 ~~~~~~~~~~ Testing :show packages, including the ghc package
diff --git a/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32 b/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
index 5b5898373f..b62a76b18e 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
@@ -1,8 +1,6 @@
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -19,11 +17,9 @@ Should fail, GADTs is not enabled
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XGADTSyntax
   -XGADTs
   -XMonoLocalBinds
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -40,10 +36,8 @@ Should work, GADTs is in force from :set
 options currently set: none.
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XGADTSyntax
   -XMonoLocalBinds
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
@@ -59,13 +53,11 @@ warning settings:
 Should fail, GADTs is now disabled
 base language is: Haskell2010
 with the following modifiers:
-  -XNoDatatypeContexts
   -XExtendedDefaultRules
   -XGADTSyntax
   -XGADTs
   -XMonoLocalBinds
   -XNoMonomorphismRestriction
-  -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
   -fno-diagnostics-show-caret
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32 b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32
index e3901290bb..f8a6b103fe 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32
@@ -1,7 +1,6 @@
 [1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o )
 [2 of 2] Compiling UnsafeInfered02  ( UnsafeInfered02.hs, UnsafeInfered02.o )
 
-UnsafeInfered02.hs:4:1: error:
+UnsafeInfered02.hs:5:1: error:
     UnsafeInfered02_A: Can't be safely imported!
     The module itself isn't safe.
-