screened 2024-06-06 22:42:46+00:00

bfrk · Jun 6, 2024 · a65b695 · a65b695
1 parent ea020a2
commit a65b695
Show file tree

Hide file tree

Showing 39 changed files with 38 additions and 51 deletions.
diff --git a/harness/Darcs/Test/Shell.hs b/harness/Darcs/Test/Shell.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP, OverloadedStrings, ExtendedDefaultRules, RecordWildCards #-}
-{-# OPTIONS_GHC -fno-warn-type-defaults #-}
+{-# OPTIONS_GHC -Wno-type-defaults #-}
 module Darcs.Test.Shell
     ( Format(..)
     , DiffAlgorithm(..)

diff --git a/harness/test.hs b/harness/test.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-missing-fields #-}
+{-# OPTIONS_GHC -Wno-missing-fields #-}
 module Main ( main, run, defaultConfig, Config(..) ) where
 
 import Darcs.Prelude

diff --git a/shelly/README.md b/shelly/README.md
@@ -106,7 +106,7 @@ This includes setting line buffering if you are dealing with text and not binary
 ~~~~~ {.haskell}
     {-# LANGUAGE OverloadedStrings #-}
     {-# LANGUAGE ExtendedDefaultRules #-}
-    {-# OPTIONS_GHC -fno-warn-type-defaults #-}
+    {-# OPTIONS_GHC -Wno-type-defaults #-}
     import Shelly
     import Data.Text as T
     default (T.Text)

diff --git a/shelly/shelly.cabal b/shelly/shelly.cabal
@@ -112,7 +112,7 @@ Test-Suite shelly-testsuite
     WriteSpec
 
   ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-               -fno-warn-unused-do-bind -fno-warn-type-defaults
+               -Wno-unused-do-bind -Wno-type-defaults
 
 
   extensions: OverloadedStrings, ExtendedDefaultRules

diff --git a/shelly/src/Shelly.hs b/shelly/src/Shelly.hs
@@ -16,7 +16,7 @@
 --
 -- > {-# LANGUAGE OverloadedStrings #-}
 -- > {-# LANGUAGE ExtendedDefaultRules #-}
--- > {-# OPTIONS_GHC -fno-warn-type-defaults #-}
+-- > {-# OPTIONS_GHC -Wno-type-defaults #-}
 -- > import Shelly
 -- > import qualified Data.Text as T
 -- > default (T.Text)
@@ -211,7 +211,7 @@ instance (CmdArg arg, ShellCmd result) => ShellCmd ([arg] -> result) where
 --
 -- > {-# LANGUAGE OverloadedStrings #-}
 -- > {-# LANGUAGE ExtendedDefaultRules #-}
--- > {-# OPTIONS_GHC -fno-warn-type-defaults #-}
+-- > {-# OPTIONS_GHC -Wno-type-defaults #-}
 -- > import Shelly
 -- > import qualified Data.Text as T
 -- > default (T.Text)

diff --git a/shelly/src/Shelly/Lifted.hs b/shelly/src/Shelly/Lifted.hs
@@ -2,7 +2,7 @@
              FlexibleInstances, FlexibleContexts, IncoherentInstances,
              TypeFamilies, ExistentialQuantification, RankNTypes,
              ImpredicativeTypes #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 -- | A module for shell-like programming in Haskell.
 -- Shelly's focus is entirely on ease of use for those coming from shell scripting.
@@ -18,7 +18,7 @@
 --
 -- > {-# LANGUAGE OverloadedStrings #-}
 -- > {-# LANGUAGE ExtendedDefaultRules #-}
--- > {-# OPTIONS_GHC -fno-warn-type-defaults #-}
+-- > {-# OPTIONS_GHC -Wno-type-defaults #-}
 -- > import Shelly
 -- > import qualified Data.Text as T
 -- > default (T.Text)

diff --git a/shelly/src/Shelly/Pipe.hs b/shelly/src/Shelly/Pipe.hs
@@ -29,7 +29,7 @@
 --
 -- > {-# LANGUAGE OverloadedStrings #-}
 -- > {-# LANGUAGE ExtendedDefaultRules #-}
--- > {-# OPTIONS_GHC -fno-warn-type-defaults #-}
+-- > {-# OPTIONS_GHC -Wno-type-defaults #-}
 -- > import Shelly
 -- > import Data.Text as T
 -- > default (T.Text)

diff --git a/src/Darcs/Patch.hs b/src/Darcs/Patch.hs
@@ -15,7 +15,7 @@
 --  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 --  Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Darcs.Patch
     ( PrimPatchBase(..)

diff --git a/src/Darcs/Patch/ApplyMonad.hs b/src/Darcs/Patch/ApplyMonad.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE UndecidableInstances #-}

diff --git a/src/Darcs/Patch/Effect.hs b/src/Darcs/Patch/Effect.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-unrecognised-pragmas #-}
+{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 module Darcs.Patch.Effect ( Effect(..) ) where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Permutations.hs b/src/Darcs/Patch/Permutations.hs
@@ -16,7 +16,7 @@
 -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -- Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Darcs.Patch.Permutations
     ( removeFL

diff --git a/src/Darcs/Patch/Prim.hs b/src/Darcs/Patch/Prim.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
 module Darcs.Patch.Prim
     ( PrimApply(..)
     , PrimCoalesce(..)

diff --git a/src/Darcs/Patch/Prim/FileUUID/Apply.hs b/src/Darcs/Patch/Prim/FileUUID/Apply.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE MultiParamTypeClasses, OverloadedStrings, UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.FileUUID.Apply ( hunkEdit, ObjectMap(..) ) where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Prim/FileUUID/Commute.hs b/src/Darcs/Patch/Prim/FileUUID/Commute.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.FileUUID.Commute () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Prim/FileUUID/Details.hs b/src/Darcs/Patch/Prim/FileUUID/Details.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.FileUUID.Details
     ()
     where

diff --git a/src/Darcs/Patch/Prim/FileUUID/Read.hs b/src/Darcs/Patch/Prim/FileUUID/Read.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ViewPatterns, OverloadedStrings #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.FileUUID.Read () where
 
 import Darcs.Prelude hiding ( take )

diff --git a/src/Darcs/Patch/Prim/FileUUID/Show.hs b/src/Darcs/Patch/Prim/FileUUID/Show.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE OverloadedStrings, UndecidableInstances #-}
 module Darcs.Patch.Prim.FileUUID.Show
     ( displayHunk )

diff --git a/src/Darcs/Patch/Prim/V1/Apply.hs b/src/Darcs/Patch/Prim/V1/Apply.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE MultiWayIf #-}
 module Darcs.Patch.Prim.V1.Apply () where
 

diff --git a/src/Darcs/Patch/Prim/V1/Coalesce.hs b/src/Darcs/Patch/Prim/V1/Coalesce.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE TupleSections #-}
 
 module Darcs.Patch.Prim.V1.Coalesce

diff --git a/src/Darcs/Patch/Prim/V1/Commute.hs b/src/Darcs/Patch/Prim/V1/Commute.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.V1.Commute () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Prim/V1/Details.hs b/src/Darcs/Patch/Prim/V1/Details.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.V1.Details
     ()
     where

diff --git a/src/Darcs/Patch/Prim/V1/Mangle.hs b/src/Darcs/Patch/Prim/V1/Mangle.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ViewPatterns #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.V1.Mangle () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Prim/V1/Read.hs b/src/Darcs/Patch/Prim/V1/Read.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.Prim.V1.Read () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/Prim/V1/Show.hs b/src/Darcs/Patch/Prim/V1/Show.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE ViewPatterns, UndecidableInstances #-}
 module Darcs.Patch.Prim.V1.Show
     ( showHunk )

diff --git a/src/Darcs/Patch/RepoPatch.hs b/src/Darcs/Patch/RepoPatch.hs
@@ -1,6 +1,3 @@
--- Darcs.Prelude import only needed for ~ for GHC 9.10+, so will generate
--- a warning on older GHCs
-{-# OPTIONS_GHC -Wno-unused-imports #-}
 module Darcs.Patch.RepoPatch
     ( RepoPatch
     , AnnotateRP

diff --git a/src/Darcs/Patch/Split.hs b/src/Darcs/Patch/Split.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ViewPatterns #-}
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -Wno-unused-imports #-}
 -- Copyright (C) 2009 Ganesh Sittampalam
 --
 -- Permission is hereby granted, free of charge, to any person

diff --git a/src/Darcs/Patch/V1/Apply.hs b/src/Darcs/Patch/V1/Apply.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V1.Apply () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/V1/Commute.hs b/src/Darcs/Patch/V1/Commute.hs
@@ -15,7 +15,7 @@
 --  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 --  Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 module Darcs.Patch.V1.Commute

diff --git a/src/Darcs/Patch/V1/Read.hs b/src/Darcs/Patch/V1/Read.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V1.Read () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/V1/Show.hs b/src/Darcs/Patch/V1/Show.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V1.Show ( showPatch_ ) where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/V1/Viewing.hs b/src/Darcs/Patch/V1/Viewing.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V1.Viewing () where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/V2/Non.hs b/src/Darcs/Patch/V2/Non.hs
@@ -15,7 +15,8 @@
 -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -- Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
+{-# OPTIONS_GHC -Wno-name-shadowing #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 

diff --git a/src/Darcs/Patch/V2/RepoPatch.hs b/src/Darcs/Patch/V2/RepoPatch.hs
@@ -15,8 +15,7 @@
 -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -- Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -Wno-name-shadowing #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 module Darcs.Patch.V2.RepoPatch

diff --git a/src/Darcs/Patch/V3.hs b/src/Darcs/Patch/V3.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V3 ( RepoPatchV3 ) where
 
 import Darcs.Prelude

diff --git a/src/Darcs/Patch/V3/Resolution.hs b/src/Darcs/Patch/V3/Resolution.hs
@@ -1,5 +1,5 @@
 {- | Conflict resolution for 'RepoPatchV3' -}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 module Darcs.Patch.V3.Resolution () where
 
 import qualified Data.Set as S

diff --git a/src/Darcs/Patch/Viewing.hs b/src/Darcs/Patch/Viewing.hs
@@ -15,7 +15,7 @@
 -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -- Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE UndecidableInstances #-}
 module Darcs.Patch.Viewing
     ( showContextHunk

diff --git a/src/Darcs/Prelude.hs b/src/Darcs/Prelude.hs
@@ -22,7 +22,6 @@ If something is needed from the Prelude that's hidden by default, then add
 it to the Prelude import.
 -}
 
-{-# LANGUAGE CPP #-}
 module Darcs.Prelude
     ( module Prelude
     , module Control.Applicative
@@ -43,11 +42,9 @@ import Prelude hiding
     ,
       -- because it's in the new Prelude but only in Data.Monoid in older GHCs
       Monoid(..)
-#if MIN_VERSION_base(4,11,0)
     ,
       -- because it's in the new Prelude but only in Data.Semigroup in older GHCs
       Semigroup(..)
-#endif
     ,
       -- because it's in the new Prelude but only in Data.Traversable in older GHCs
       traverse
@@ -60,10 +57,6 @@ import Prelude hiding
     ,
       -- used by various code for no particularly good reason
       lookup, pred
-#if MIN_VERSION_base(4,20,0)
-    , -- because it's in the new Prelude but only in Data.List in older GHCs
-      foldl'
-#endif
     )
 
 import Control.Applicative ( Applicative(..), (<$>), (<*>) )

diff --git a/src/Darcs/Repository/ApplyPatches.hs b/src/Darcs/Repository/ApplyPatches.hs
@@ -15,7 +15,7 @@
 -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -- Boston, MA 02110-1301, USA.
 
-{-# OPTIONS_GHC -fno-warn-missing-methods #-}
+{-# OPTIONS_GHC -Wno-missing-methods #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 
 module Darcs.Repository.ApplyPatches

diff --git a/src/Darcs/UI/Commands/ShowAuthors.hs b/src/Darcs/UI/Commands/ShowAuthors.hs
@@ -18,8 +18,6 @@
 -- to suppress an irrelevant warning GHC 9.10 and 9.12
 -- NE.unzip is shifting to being monomorphic but our usage already is
 {-# OPTIONS_GHC -Wno-x-data-list-nonempty-unzip #-}
--- to suppress warnings about the above warning flag in other GHCs :-)
-{-# OPTIONS_GHC -Wno-unrecognised-warning-flags #-}
 module Darcs.UI.Commands.ShowAuthors
     ( showAuthors, Spelling, compiledAuthorSpellings, canonizeAuthor, rankAuthors
     ) where