use correct estimate

Author: wz1000

src/Development/Shake/Internal/Core/Build.hs

@@ -72,8 +72,8 @@ getDatabaseValueGeneric k = do
 -- NEW STYLE PRIMITIVES
 
 -- | Lookup the value for a single Id, may need to spawn it
-lookupOne :: Global -> Stack -> Database -> Maybe Float -> Id -> Wait Locked (Either SomeException (Result (Value, BS_Store)))
-lookupOne global stack database est i = do
+lookupOne :: Global -> Stack -> Database -> Id -> Wait Locked (Either SomeException (Result (Value, BS_Store)))
+lookupOne global stack database i = do
     res <- quickly $ liftIO $ getKeyValueFromId database i
     case res of
         Nothing -> Now $ Left $ errorStructured "Shake Id no longer exists" [("Id", Just $ show i)] ""
@@ -89,22 +89,22 @@ lookupOne global stack database est i = do
                     Running (NoShow w) r -> do
                         let w2 v = w v >> continue v
                         setMem database i k $ Running (NoShow w2) r
-                    Loaded r -> buildOne global stack database est i k (Just r) `fromLater` continue
-                    Missing -> buildOne global stack database est i k Nothing `fromLater` continue
+                    Loaded r -> buildOne global stack database i k (Just r) `fromLater` continue
+                    Missing -> buildOne global stack database i k Nothing `fromLater` continue
 
 
 -- | Build a key, must currently be either Loaded or Missing, changes to Waiting
-buildOne :: Global -> Stack -> Database -> Maybe Float -> Id -> Key -> Maybe (Result BS.ByteString) -> Wait Locked (Either SomeException (Result (Value, BS_Store)))
-buildOne global@Global{..} stack database est i k r = case addStack i k stack of
+buildOne :: Global -> Stack -> Database -> Id -> Key -> Maybe (Result BS.ByteString) -> Wait Locked (Either SomeException (Result (Value, BS_Store)))
+buildOne global@Global{..} stack database i k r = case addStack i k stack of
     Left e -> do
         quickly $ setIdKeyStatus global database i k $ mkError e
         pure $ Left e
     Right stack -> Later $ \continue -> do
         setIdKeyStatus global database i k (Running (NoShow continue) r)
         let go = buildRunMode global stack database r
-            priority = case est of
+            priority = case r of
               Nothing -> PoolStart
-              Just t -> PoolEstimate t (show k)
+              Just (execution -> t) -> PoolEstimate t (show k)
         fromLater go $ \mode -> liftIO $ addPool priority globalPool $
             runKey global stack k r mode $ \res -> do
                 runLocked database $ do
@@ -136,7 +136,7 @@ buildRunMode global stack database me = do
 -- | Have the dependencies changed
 buildRunDependenciesChanged :: Global -> Stack -> Database -> Result a -> Wait Locked Bool
 buildRunDependenciesChanged global stack database me = isJust <$> firstJustM id
-    [firstJustWaitUnordered (fmap test . lookupOne global stack database (Just $ execution me)) x | Depends x <- depends me]
+    [firstJustWaitUnordered (fmap test . lookupOne global stack database) x | Depends x <- depends me]
     where
         test (Right dep) | changed dep <= built me = Nothing
         test _ = Just ()
@@ -162,7 +162,7 @@ applyKeyValue callStack ks = do
     (is, wait) <- liftIO $ runLocked database $ do
         is <- mapM (mkId database) ks
         wait <- runWait $ do
-            x <- firstJustWaitUnordered (fmap (either Just (const Nothing)) . lookupOne global stack database Nothing) $ nubOrd is
+            x <- firstJustWaitUnordered (fmap (either Just (const Nothing)) . lookupOne global stack database) $ nubOrd is
             case x of
                 Just e -> pure $ Left e
                 Nothing -> quickly $ Right <$> mapM (fmap (\(Just (_, Ready r)) -> fst $ result r) . liftIO . getKeyValueFromId database) is
@@ -267,7 +267,7 @@ historyLoad (Ver -> ver) = do
             let ask k = do
                     i <- quickly $ mkId database k
                     let identify = runIdentify globalRules k . fst . result
-                    either (const Nothing) identify <$> lookupOne global localStack database Nothing i
+                    either (const Nothing) identify <$> lookupOne global localStack database i
             x <- case globalShared of
                 Nothing -> pure Nothing
                 Just shared -> lookupShared shared ask key localBuiltinVersion ver