bump

.circleci/config.yml

@@ -6,10 +6,10 @@ parameters:
     default: "blanks"
   cache_ver:
     type: string
-    default: "v3"
+    default: "v6"
   haskell_image:
     type: string
-    default: "ejconlon/haskell-custom"
+    default: "haskell"
 
 commands:
   install_native_deps:
@@ -76,9 +76,9 @@ workflows:
   build:
     jobs:
       - stack_build:
-          lts_ghc_ver: 8.10.7
+          lts_ghc_ver: 9.0.2
       - cabal_build:
-          name: cabal_build_8_10
-          ghc_ver: 8.10.7
+          name: cabal_build_9_0
+          ghc_ver: 9.0.2
           requires:
             - stack_build

.gitignore

@@ -1,5 +1,6 @@
 /.hie
 /.stack-work
+/.vscode
 /dist
 /dist-newstyle
 *~

Makefile.base

@@ -20,11 +20,7 @@ docs:
 
 .PHONY: deps
 deps:
-	stack build --copy-compiler-tool ghcid hlint stylish-haskell implicit-hie
-
-.PHONY: watch
-watch:
-	stack exec -- ghcid --lint=`stack exec -- which hlint`
+	stack build --copy-compiler-tool hlint implicit-hie ghcid
 
 .PHONY: format
 format:

src/Blanks/Transform/Abstract.hs

@@ -5,8 +5,8 @@ module Blanks.Transform.Abstract where
 
 import Blanks.Conversion (locScopeForget, scopeAnno)
 import Blanks.Internal.Abstract (Abstract (..), IsAbstractInfo (..))
-import Blanks.LocScope (LocScope, locScopeBindFree, pattern LocScopeAbstract, pattern LocScopeBound,
-                        pattern LocScopeEmbed, pattern LocScopeFree)
+import Blanks.LocScope (LocScope, pattern LocScopeAbstract, pattern LocScopeBound, pattern LocScopeEmbed,
+                        pattern LocScopeFree, locScopeBindFree)
 import Blanks.Scope (Scope)
 import Control.DeepSeq (NFData)
 import Control.Exception (Exception)

src/Blanks/Transform/Track.hs

@@ -15,8 +15,8 @@ module Blanks.Transform.Track
 
 import Blanks.Conversion (scopeAnno)
 import Blanks.Internal.Abstract (IsAbstractInfo (..), ShouldShift (..))
-import Blanks.LocScope (LocScope, locScopeHoistAnno, pattern LocScopeAbstract, pattern LocScopeBound,
-                        pattern LocScopeEmbed, pattern LocScopeFree)
+import Blanks.LocScope (LocScope, pattern LocScopeAbstract, pattern LocScopeBound, pattern LocScopeEmbed,
+                        pattern LocScopeFree, locScopeHoistAnno)
 import Blanks.Scope (Scope)
 import Blanks.Util.Located (Located (..))
 import Control.DeepSeq (NFData)

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-18.11
+resolver: lts-19.17
 
 ghc-options:
   "$everything": -haddock

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 586041
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/11.yaml
-    sha256: ae30d25a4691c6bb32b5766c617dff24270b2b3576ebd6047d754418e9256389
-  original: lts-18.11
+    size: 619161
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/17.yaml
+    sha256: 7f47507fd037228a8d23cf830f5844e1f006221acebdd7cb49f2f5fb561e0546
+  original: lts-19.17

test/Test/Blanks/Lib/Exp.hs

@@ -31,9 +31,9 @@ module Test.Blanks.Lib.Exp
   , declToNamed
   ) where
 
-import Blanks (Abstract (..), IsAbstractInfo (..), LocScope, Located (..), Placed (..), Scope, ShouldShift (..),
-               locScopeBindFree1, locScopeForget, locScopeUnBindFree1, pattern LocScopeAbstract, pattern LocScopeBound,
-               pattern LocScopeEmbed, pattern LocScopeFree, scopeAnno)
+import Blanks (Abstract (..), IsAbstractInfo (..), LocScope, pattern LocScopeAbstract, pattern LocScopeBound,
+               pattern LocScopeEmbed, pattern LocScopeFree, Located (..), Placed (..), Scope, ShouldShift (..),
+               locScopeBindFree1, locScopeForget, locScopeUnBindFree1, scopeAnno)
 import Control.DeepSeq (NFData)
 import Control.Monad (when)
 import Data.Set (Set)

test/Test/Blanks/Lib/LiftScope.hs

@@ -1,8 +1,8 @@
 module Test.Blanks.Lib.LiftScope where
 
-import Blanks (Abstract (..), AbstractId, LiftAbstract (..), LiftFunctor (..), LiftState, LocScope, Located (..), State,
-               Tracked, WithTracked, locScopeBindFree1, locScopeLocation, pattern LocScopeAbstract,
-               pattern LocScopeBound, pattern LocScopeEmbed, predLiftLocScope, scopeAnno, trackScope)
+import Blanks (Abstract (..), AbstractId, LiftAbstract (..), LiftFunctor (..), LiftState, LocScope,
+               pattern LocScopeAbstract, pattern LocScopeBound, pattern LocScopeEmbed, Located (..), State, Tracked,
+               WithTracked, locScopeBindFree1, locScopeLocation, predLiftLocScope, scopeAnno, trackScope)
 import qualified Data.Sequence as Seq
 import Data.Set (Set)
 import qualified Data.Set as Set

test/Test/Blanks/Lib/SimpleScope.hs

@@ -2,8 +2,8 @@
 
 module Test.Blanks.Lib.SimpleScope where
 
-import Blanks (Abstract (..), IsAbstractInfo (..), Located (..), Placed (..), Scope, ShouldShift (..), Tracked,
-               locScopeLocation, pattern ScopeAbstract, pattern ScopeBound, pattern ScopeEmbed, scopeBindFree1,
+import Blanks (Abstract (..), IsAbstractInfo (..), Located (..), Placed (..), Scope, pattern ScopeAbstract,
+               pattern ScopeBound, pattern ScopeEmbed, ShouldShift (..), Tracked, locScopeLocation, scopeBindFree1,
                trackScopeSimple)
 import Control.DeepSeq (NFData)
 import Data.Sequence (Seq)

test/Test/Blanks/Tests/ExpTest.hs

@@ -2,8 +2,8 @@ module Test.Blanks.Tests.ExpTest
   ( testExp
   ) where
 
-import Blanks (Abstract (..), locScopeForget, locScopeLocation, pattern ScopeAbstract, pattern ScopeBound,
-               pattern ScopeEmbed, pattern ScopeFree)
+import Blanks (Abstract (..), pattern ScopeAbstract, pattern ScopeBound, pattern ScopeEmbed, pattern ScopeFree,
+               locScopeForget, locScopeLocation)
 import Test.Blanks.Lib.Exp (Exp (..), ExpScope, Ident (..), Info (..), cexpLoc, expToNamed, expToNameless,
                             runCExpParser, synSpan)
 import Test.Tasty (TestName, TestTree, testGroup)