Rename Fresh to AtomicCounter

spectrometer.cabal

@@ -164,7 +164,7 @@ library
     Control.Carrier.Diagnostics
     Control.Carrier.Diagnostics.StickyContext
     Control.Carrier.Finally
-    Control.Carrier.Fresh
+    Control.Carrier.AtomicCounter
     Control.Carrier.Output.IO
     Control.Carrier.StickyLogger
     Control.Carrier.TaskPool
@@ -173,7 +173,7 @@ library
     Control.Effect.ConsoleRegion
     Control.Effect.Diagnostics
     Control.Effect.Finally
-    Control.Effect.Fresh
+    Control.Effect.AtomicCounter
     Control.Effect.Output
     Control.Effect.Path
     Control.Effect.Record

src/App/Fossa/Analyze.hs

@@ -83,7 +83,7 @@ import System.Exit (die, exitFailure)
 import Types
 import VCS.Git (fetchGitContributors)
 import Control.Carrier.Diagnostics.StickyContext
-import Control.Carrier.Fresh (Fresh, runFresh)
+import Control.Carrier.AtomicCounter (AtomicCounter, runAtomicCounter)
 
 data ScanDestination
   = UploadScan ApiOpts ProjectMetadata -- ^ upload to fossa with provided api key and base url
@@ -171,7 +171,7 @@ discoverFuncs =
   ]
 
 runDependencyAnalysis ::
-  (Has (Lift IO) sig m, Has Fresh sig m, Has Logger sig m, Has (Output ProjectResult) sig m) =>
+  (Has (Lift IO) sig m, Has AtomicCounter sig m, Has Logger sig m, Has (Output ProjectResult) sig m) =>
   -- | Analysis base directory
   BaseDir ->
   [BuildTargetFilter] ->
@@ -216,7 +216,7 @@ analyze (BaseDir basedir) destination override unpackArchives filters = do
       . runStickyLogger
       . runFinally
       . withTaskPool capabilities updateProgress
-      . runFresh
+      . runAtomicCounter
       $ withDiscoveredProjects discoverFuncs (fromFlag UnpackArchives unpackArchives) basedir (runDependencyAnalysis (BaseDir basedir) filters)
 
   let filteredProjects = filterProjects (BaseDir basedir) projectResults

src/App/Fossa/ListTargets.hs

@@ -9,7 +9,7 @@ import App.Fossa.Analyze (discoverFuncs)
 import App.Types (BaseDir (..))
 import Control.Carrier.Diagnostics qualified as Diag
 import Control.Carrier.Finally
-import Control.Carrier.Fresh
+import Control.Carrier.AtomicCounter
 import Control.Carrier.StickyLogger (runStickyLogger, logSticky', StickyLogger)
 import Control.Carrier.TaskPool
 import Control.Concurrent (getNumCapabilities)
@@ -34,7 +34,7 @@ listTargetsMain (BaseDir basedir) = do
     . withTaskPool capabilities updateProgress
     . runReadFSIO
     . runExecIO
-    . runFresh
+    . runAtomicCounter
     $ do
       withDiscoveredProjects discoverFuncs False basedir $ \(project :: DiscoveredProject DummyM) -> do
         let maybeRel = makeRelative basedir (projectPath project)

src/App/Pathfinder/Scan.hs

@@ -5,6 +5,7 @@ module App.Pathfinder.Scan
   ( scanMain
   ) where
 
+import Control.Carrier.AtomicCounter (runAtomicCounter)
 import Control.Carrier.Diagnostics qualified as Diag
 import Control.Carrier.Error.Either
 import Control.Carrier.Finally
@@ -14,7 +15,6 @@ import Control.Carrier.TaskPool
 import Control.Concurrent
 import Control.Effect.Exception as Exc
 import Control.Effect.Lift (sendIO)
-import Control.Carrier.Fresh (runFresh)
 import Control.Monad (unless)
 import Control.Monad.IO.Class (MonadIO)
 import Data.Aeson
@@ -68,7 +68,7 @@ scan basedir = runFinally $ do
       . runReadFSIO
       . runFinally
       . withTaskPool capabilities updateProgress
-      . runFresh
+      . runAtomicCounter
       $ withDiscoveredProjects discoverFuncs False basedir runLicenseAnalysis
 
   sendIO (BL.putStr (encode projectResults))

src/Control/Carrier/Diagnostics/StickyContext.hs

@@ -15,9 +15,9 @@ import Control.Monad.Trans.Class (MonadTrans (..))
 import Data.List (intersperse)
 import Data.Text qualified as T
 import Effect.Logger
-import Control.Effect.Fresh
+import Control.Effect.AtomicCounter
 
-stickyDiag :: (Has Fresh sig m, Has (Lift IO) sig m) => StickyDiagC m a -> m a
+stickyDiag :: (Has AtomicCounter sig m, Has (Lift IO) sig m) => StickyDiagC m a -> m a
 stickyDiag act = do
   taskId <- generateId
   Sticky.withStickyRegion $ \region ->

src/Discovery/Projects.hs

@@ -6,8 +6,8 @@ module Discovery.Projects (
 
 import Control.Carrier.Diagnostics qualified as Diag
 import Control.Carrier.Diagnostics.StickyContext
+import Control.Effect.AtomicCounter (AtomicCounter)
 import Control.Effect.Finally
-import Control.Effect.Fresh
 import Control.Effect.Lift
 import Control.Effect.TaskPool
 import Control.Monad (when)
@@ -23,7 +23,7 @@ import Types (DiscoveredProject)
 -- on each discovered project. Note that the provided function is also run in
 -- parallel.
 withDiscoveredProjects ::
-  (Has Fresh sig m, Has ReadFS sig m, Has (Lift IO) sig m, Has TaskPool sig m, Has Logger sig m, Has Finally sig m) =>
+  (Has AtomicCounter sig m, Has ReadFS sig m, Has (Lift IO) sig m, Has TaskPool sig m, Has Logger sig m, Has Finally sig m) =>
   -- | Discover functions
   [Path Abs Dir -> StickyDiagC (Diag.DiagnosticsC m) [DiscoveredProject run]] ->
   -- | whether to unpack archives