Support for GHC 9.10

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ghc: ['9.8.1', '9.6.3', '9.4.1', '9.2.4']
+        ghc: ['9.10.1', '9.8.1', '9.6.3', '9.4.1', '9.2.4']
 
     steps:
     - uses: actions/checkout@v2

CONTRIBUTING.md

@@ -3,8 +3,8 @@ We want to make contributing to this project as easy and transparent as
 possible.
 
 ## Our Development Process
-retrie is developed internally at Facebook and then exported to GitHub by an 
-automated tool. Pull requests will first be imported to our internal 
+retrie is developed internally at Facebook and then exported to GitHub by an
+automated tool. Pull requests will first be imported to our internal
 repository, then synced back to GitHub.
 
 ## Pull Requests
@@ -30,7 +30,7 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 disclosure of security bugs. In those cases, please go through the process
 outlined on that page and do not file a public issue.
 
-## Coding Style  
+## Coding Style
 * 2 spaces for indentation rather than tabs
 * 80 character line length
 * Avoid using whitespace to vertically align things unnecessarily.

Retrie/CPP.hs

@@ -332,9 +332,13 @@ insertImports
   -> Located (HsModule GhcPs)     -- ^ target module
   -> TransformT m (Located (HsModule GhcPs))
 #endif
-insertImports is (L l m) = do
-  imps <- graftA $ filterAndFlatten (unLoc <$> hsmodName m) is
+insertImports is (L l m') = do
+  imps' <- graftA $ filterAndFlatten (unLoc <$> hsmodName m') is
   let
+    (L _ m) = makeDeltaAst (L l m')
+    imps = case imps' of
+             [] -> []
+             (h:t) -> (setEntryDP h (DifferentLine 1 1):t)
     deduped = nubBy (eqImportDecl `on` unLoc) $ hsmodImports m ++ imps
   return $ L l m { hsmodImports = deduped }
 

Retrie/Context.hs

@@ -18,7 +18,9 @@ import Control.Monad.IO.Class
 import Data.Char (isDigit)
 import Data.Either (partitionEithers)
 import Data.Generics hiding (Fixity)
+#if __GLASGOW_HASKELL__ < 910
 import Data.List
+#endif
 import Data.Maybe
 
 import Retrie.AlphaEnv
@@ -60,7 +62,7 @@ updateContext c i =
     updExp (OpApp _ _ op _)
       | Fixity source prec dir <- lookupOp op $ ctxtFixityEnv c =
           withPrec c source prec dir i
-#if __GLASGOW_HASKELL__ < 904
+#if __GLASGOW_HASKELL__ < 904 || __GLASGOW_HASKELL__ >= 910
     updExp (HsLet _ lbs _) = addInScope neverParen $ collectLocalBinders CollNoDictBinders lbs
 #else
     updExp (HsLet _ _ lbs _ _) = addInScope neverParen $ collectLocalBinders CollNoDictBinders lbs