[Git][ghc/ghc][master] 2 commits: Cinch -fno-warn-name-shadowing down to specific GHCi module

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
d05d13ce by John Ericson at 2020-09-19T15:49:57-04:00
Cinch -fno-warn-name-shadowing down to specific GHCi module

- - - - -
f1accd00 by Sylvain Henry at 2020-09-19T15:49:57-04:00
Add quick-validate Hadrian flavour (quick + -Werror)

- - - - -


6 changed files:

- ghc/GHCi/UI.hs
- ghc/GHCi/UI/Info.hs
- ghc/GHCi/UI/Monad.hs
- ghc/ghc-bin.cabal.in
- hadrian/src/Settings.hs
- hadrian/src/Settings/Flavours/Quick.hs


Changes:

=====================================
ghc/GHCi/UI.hs
=====================================
@@ -11,6 +11,9 @@
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS -fno-warn-name-shadowing #-}
+-- This module does a lot of it
+
 -----------------------------------------------------------------------------
 --
 -- GHC Interactive User Interface


=====================================
ghc/GHCi/UI/Info.hs
=====================================
@@ -4,6 +4,8 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ViewPatterns        #-}
 
+{-# OPTIONS -fno-warn-name-shadowing #-}
+
 -- | Get information on modules, expressions, and identifiers
 module GHCi.UI.Info
     ( ModInfo(..)


=====================================
ghc/GHCi/UI/Monad.hs
=====================================
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP, FlexibleInstances, DeriveFunctor, DerivingVia #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS -fno-warn-name-shadowing #-}
 
 -----------------------------------------------------------------------------
 --


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -65,7 +65,6 @@ Executable ghc
             exceptions     == 0.10.*,
             time           >= 1.8 && < 1.10
         CPP-Options: -DHAVE_INTERNAL_INTERPRETER
-        GHC-Options: -fno-warn-name-shadowing
         Other-Modules:
             GHCi.Leak
             GHCi.UI


=====================================
hadrian/src/Settings.hs
=====================================
@@ -54,7 +54,8 @@ hadrianFlavours :: [Flavour]
 hadrianFlavours =
     [ benchmarkFlavour, defaultFlavour, developmentFlavour Stage1
     , developmentFlavour Stage2, performanceFlavour, profiledFlavour
-    , quickFlavour, quickestFlavour, quickCrossFlavour, benchmarkLlvmFlavour
+    , quickFlavour, quickValidateFlavour, quickestFlavour
+    , quickCrossFlavour, benchmarkLlvmFlavour
     , performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour
     , ghcInGhciFlavour, validateFlavour, slowValidateFlavour ]
 


=====================================
hadrian/src/Settings/Flavours/Quick.hs
=====================================
@@ -1,4 +1,8 @@
-module Settings.Flavours.Quick (quickFlavour) where
+module Settings.Flavours.Quick
+   ( quickFlavour
+   , quickValidateFlavour
+   )
+where
 
 import Expression
 import Flavour
@@ -30,3 +34,8 @@ quickArgs = sourceArgs SourceArgs
     , hsLibrary  = notStage0 ? arg "-O"
     , hsCompiler =    stage0 ? arg "-O2"
     , hsGhc      =    stage0 ? arg "-O" }
+
+quickValidateFlavour :: Flavour
+quickValidateFlavour = werror $ quickFlavour
+    { name = "quick-validate"
+    }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c1b8ad931e7bfabe521bc17e74ac9869b21a748...f1accd00969e0b2993f14ee4ed858cea0c13357e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c1b8ad931e7bfabe521bc17e74ac9869b21a748...f1accd00969e0b2993f14ee4ed858cea0c13357e
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200919/08d1eb84/attachment-0001.html>