use per-instance OVERLAPS pragma instead of OverlappingInstances exte…

…nsion
DanielSchuessler · Sep 16, 2024 · 3862ddc · 3862ddc
1 parent a4b72bd
commit 3862ddc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/Codec/TPTP/Base.hs b/Codec/TPTP/Base.hs
@@ -2,7 +2,7 @@
   , StandaloneDeriving
   , TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   , UndecidableInstances, DeriveDataTypeable, GeneralizedNewtypeDeriving
-  , OverlappingInstances, ScopedTypeVariables
+  , ScopedTypeVariables
   #-}
 
 module Codec.TPTP.Base where

diff --git a/Codec/TPTP/Diff.hs b/Codec/TPTP/Diff.hs
@@ -2,7 +2,7 @@
   , StandaloneDeriving, MultiParamTypeClasses, FunctionalDependencies
   , TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   , UndecidableInstances, DeriveDataTypeable, GeneralizedNewtypeDeriving
-  , OverlappingInstances, OverloadedStrings, RankNTypes
+  , OverloadedStrings, RankNTypes
   #-}
 {-# OPTIONS -Wall #-}
 
@@ -195,10 +195,10 @@ diffFormula (F (Identity f1)) (F (Identity f2)) = F $
       _ -> let plug=plugSubformulae (T DontCare) (F DontCare) in Differ (plug f1) (plug f2)
 
 
-instance Show (T DiffResult) where
+instance {-# OVERLAPPING #-} Show (T DiffResult) where
     show (T t) = show t
 
-instance Show (F DiffResult) where
+instance {-# OVERLAPPING #-} Show (F DiffResult) where
     show (F f) = show f
 
 type T0Diff = DiffResult (Term0 (T DiffResult))

diff --git a/Codec/TPTP/Export.hs b/Codec/TPTP/Export.hs
@@ -2,7 +2,7 @@
   , StandaloneDeriving
   , TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   , UndecidableInstances, DeriveDataTypeable, GeneralizedNewtypeDeriving
-  , OverlappingInstances, RankNTypes
+  , RankNTypes
   #-}
 {-# OPTIONS -Wall #-}
 module Codec.TPTP.Export(toTPTP',ToTPTP(..),isLowerWord) where

diff --git a/Codec/TPTP/Pretty.hs b/Codec/TPTP/Pretty.hs
@@ -2,7 +2,7 @@
   , StandaloneDeriving
   , TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   , UndecidableInstances, DeriveDataTypeable, GeneralizedNewtypeDeriving
-  , OverlappingInstances, RankNTypes, PatternGuards
+  , RankNTypes, PatternGuards
   #-}
 
 {-# OPTIONS -Wall -fno-warn-orphans #-}

diff --git a/Codec/TPTP/QuickCheck.hs b/Codec/TPTP/QuickCheck.hs
@@ -2,7 +2,7 @@
   , StandaloneDeriving
   , TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   , UndecidableInstances, DeriveDataTypeable, GeneralizedNewtypeDeriving
-  , OverlappingInstances, RankNTypes, PatternGuards
+  , RankNTypes, PatternGuards
   #-}
 {-# OPTIONS -Wall #-}
 module Codec.TPTP.QuickCheck where

diff --git a/testing/Prof.hs b/testing/Prof.hs
@@ -5,7 +5,6 @@
  -XNamedFieldPuns
  -XRecordWildCards
  -XDeriveDataTypeable
- -XOverlappingInstances
  -fwarn-incomplete-patterns
  #-}
 

diff --git a/testing/SimpleArgs.hs b/testing/SimpleArgs.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances, UndecidableInstances, OverlappingInstances #-}
+{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
 
 -- Copied and modified from https://hackage.haskell.org/package/simpleargs-0.2.1
 -- which is licensed under GNU LESSER GENERAL PUBLIC LICENSE Version 2.1