Provide result to bracket completed

Author: natefaubion

src/Control/Monad/Aff.js

@@ -511,7 +511,7 @@ function runFiber(util, suspended, aff, completeCb) {
             } else if (fail !== null) {
               step = attempt._1.failed(util.fromLeft(fail))(attempt._2);
             } else {
-              step = attempt._1.completed(attempt._2);
+              step = attempt._1.completed(util.fromRight(step))(attempt._2);
             }
             break;
 

src/Control/Monad/Aff.purs

@@ -255,7 +255,7 @@ bracket acquire completed =
   generalBracket acquire
     { killed: const completed
     , failed: const completed
-    , completed
+    , completed: const completed
     }
 
 foreign import _pure ∷ ∀ eff a. a → Aff eff a
@@ -270,16 +270,16 @@ foreign import _parAffMap ∷ ∀ eff a b. (a → b) → ParAff eff a → ParAff
 foreign import _parAffApply ∷ ∀ eff a b. ParAff eff (a → b) → ParAff eff a → ParAff eff b
 foreign import _parAffAlt ∷ ∀ eff a. ParAff eff a → ParAff eff a → ParAff eff a
 
-type BracketConditions eff a =
+type BracketConditions eff a b =
   { killed ∷ Error → a → Aff eff Unit
   , failed ∷ Error → a → Aff eff Unit
-  , completed ∷ a → Aff eff Unit
+  , completed ∷ b → a → Aff eff Unit
   }
 
 -- | A general purpose bracket which lets you observe the status of the
 -- | bracketed action. The bracketed action may have been killed with an
 -- | exception, thrown an exception, or completed successfully.
-foreign import generalBracket ∷ ∀ eff a b. Aff eff a → BracketConditions eff a → (a → Aff eff b) → Aff eff b
+foreign import generalBracket ∷ ∀ eff a b. Aff eff a → BracketConditions eff a b → (a → Aff eff b) → Aff eff b
 
 -- | Constructs an `Aff` from low-level `Eff` effects using a callback. A
 -- | `Canceler` effect should be returned to cancel the pending action. The

test/Test/Main.purs

@@ -237,7 +237,7 @@ test_general_bracket = assert "bracket/general" do
       generalBracket (action s)
         { killed: \error s' → void $ action (s' <> "/kill/" <> message error)
         , failed: \error s' → void $ action (s' <> "/throw/" <> message error)
-        , completed: \s' → void $ action (s' <> "/release")
+        , completed: \r s' → void $ action (s' <> "/release/" <> r)
         }
 
   f1 ← forkAff $ bracketAction "foo" (const (action "a"))
@@ -251,7 +251,7 @@ test_general_bracket = assert "bracket/general" do
   r3 ← try $ joinFiber f3
 
   r4 ← readRef ref
-  pure (isLeft r1 && isLeft r2 && isRight r3 && r4 == "foofoo/kill/zbarbar/throw/bbazcbaz/release")
+  pure (isLeft r1 && isLeft r2 && isRight r3 && r4 == "foofoo/kill/zbarbar/throw/bbazcbaz/release/c")
 
 test_kill ∷ ∀ eff. TestAff eff Unit
 test_kill = assert "kill" do
@@ -324,7 +324,7 @@ test_kill_child = assert "kill/child" do
       (modifyRef ref (_ <> "acquire" <> s))
       { failed: \_ _ → modifyRef ref (_ <> "throw" <> s)
       , killed: \_ _ → modifyRef ref (_ <> "kill" <> s)
-      , completed: \_ → modifyRef ref (_ <> "complete" <> s)
+      , completed: \_ _ → modifyRef ref (_ <> "complete" <> s)
       }
       (\_ -> do
         delay (Milliseconds 10.0)