updates for GHC HEAD (ghc-next variant)

Author: shayne-fletcher

hlint.cabal

@@ -185,5 +185,6 @@ executable hlint
     ghc-options:        -rtsopts -with-rtsopts=-A32m
     if flag(threaded)
         ghc-options:    -threaded
+
     if os(darwin)
         ld-options:     -framework Security

src/Apply.hs

@@ -17,7 +17,7 @@ import Data.Ord
 import Config.Type
 import Config.Haskell
 import GHC.Types.SrcLoc
-import GHC.Hs hiding (comments)
+import GHC.Hs hiding (comments, Infix)
 import Language.Haskell.GhclibParserEx.GHC.Hs
 import Data.HashSet qualified as Set
 import Prelude

src/Config/Compute.hs

@@ -10,7 +10,7 @@ import Config.Type
 import Fixity
 import Data.Generics.Uniplate.DataOnly
 import Data.List.NonEmpty(NonEmpty(..))
-import GHC.Hs hiding (Warning)
+import GHC.Hs hiding (Infix, Warning)
 import GHC.Types.Name.Reader
 import GHC.Types.Name
 import GHC.Types.SrcLoc

src/Config/Yaml.hs

@@ -51,7 +51,7 @@ import Prelude
 import GHC.Data.Bag
 import GHC.Parser.Lexer
 import GHC.Utils.Error hiding (Severity)
-import GHC.Hs
+import GHC.Hs hiding (Infix)
 import GHC.Types.SrcLoc
 import GHC.Types.Name.Reader
 import GHC.Types.Name.Occurrence

src/Fixity.hs

@@ -7,11 +7,11 @@ module Fixity(
     ) where
 
 import GHC.Generics(Associativity(..))
+import GHC.Hs.Basic
 import GHC.Hs.Binds
 import GHC.Hs.Extension
 import GHC.Types.Name.Occurrence
 import GHC.Types.Name.Reader
-import GHC.Types.Fixity
 import GHC.Parser.Annotation
 import Language.Haskell.GhclibParserEx.GHC.Types.Name.Reader
 import Language.Haskell.GhclibParserEx.Fixity

src/Hint/Extensions.hs

@@ -278,7 +278,6 @@ import GHC.Data.FastString
 import GHC.Types.SrcLoc
 import GHC.Types.SourceText
 import GHC.Hs
-import GHC.Types.Basic
 import GHC.Types.Name.Reader
 import GHC.Types.ForeignCall
 import GHC.Data.Strict qualified

src/Hint/Fixities.hs

@@ -26,7 +26,7 @@ import Refact.Types
 
 import GHC.Types.Fixity(compareFixity)
 import Fixity
-import GHC.Hs
+import GHC.Hs hiding (Infix)
 import GHC.Util
 import Language.Haskell.GhclibParserEx.GHC.Utils.Outputable
 import GHC.Types.SrcLoc