Finish dependencies update

Author: garyb

src/Network/HTTP/Affjax.purs

@@ -1,55 +1,54 @@
 module Network.HTTP.Affjax
-  ( AJAX()
-  , Affjax()
-  , AffjaxRequest(), defaultRequest
-  , AffjaxResponse()
-  , URL()
+  ( AJAX
+  , Affjax
+  , AffjaxRequest, defaultRequest
+  , AffjaxResponse
+  , URL
   , affjax
   , affjax'
   , get
   , post, post_, post', post_'
   , put, put_, put', put_'
   , delete, delete_
   , patch, patch_, patch', patch_'
-  , RetryDelayCurve()
+  , RetryDelayCurve
   , RetryPolicy(..)
   , defaultRetryPolicy
   , retry
   ) where
 
 import Prelude hiding (max)
 
-import Control.Bind ((<=<))
-import Control.Monad.Aff (Aff(), makeAff, makeAff', Canceler(..), attempt, later', forkAff, cancel)
-import Control.Monad.Aff.AVar (AVAR(), makeVar, takeVar, putVar)
-import Control.Monad.Eff (Eff())
+import Control.Monad.Aff (Aff, makeAff, makeAff', Canceler(..), attempt, later', forkAff, cancel)
+import Control.Monad.Aff.AVar (AVAR, makeVar, takeVar, putVar)
+import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Class (liftEff)
-import Control.Monad.Eff.Exception (Error(), error)
-import Control.Monad.Eff.Ref (REF(), newRef, readRef, writeRef)
-import Control.Monad.Error.Class (throwError)
+import Control.Monad.Eff.Exception (Error, error)
+import Control.Monad.Eff.Ref (REF, newRef, readRef, writeRef)
+import Control.Monad.Except (runExcept, throwError)
 
 import Data.Array as Arr
 import Data.Either (Either(..), either)
 import Data.Foldable (any)
-import Data.Foreign (Foreign(), F(), parseJSON, readString)
+import Data.Foreign (Foreign, F, parseJSON, readString)
 import Data.Function (on)
-import Data.Function.Uncurried (Fn5(), runFn5, Fn4(), runFn4)
-import Data.HTTP.Method (Method(..), CustomMethod())
+import Data.Function.Uncurried (Fn5, runFn5, Fn4, runFn4)
+import Data.HTTP.Method (Method(..), CustomMethod)
 import Data.HTTP.Method as Method
 import Data.Int (toNumber, round)
 import Data.Maybe (Maybe(..))
-import Data.MediaType (MediaType())
-import Data.Nullable (Nullable(), toNullable)
+import Data.MediaType (MediaType)
+import Data.Nullable (Nullable, toNullable)
 import Data.Tuple (Tuple(..), fst, snd)
 
 import Math (max, pow)
 
-import DOM.XHR.Types (XMLHttpRequest())
+import DOM.XHR.Types (XMLHttpRequest)
 
 import Network.HTTP.Affjax.Request (class Requestable, RequestContent, toRequest)
 import Network.HTTP.Affjax.Response (class Respondable, ResponseContent, ResponseType(..), fromResponse, responseType, responseTypeToString)
 import Network.HTTP.RequestHeader (RequestHeader(..), requestHeaderName, requestHeaderValue)
-import Network.HTTP.ResponseHeader (ResponseHeader(), responseHeader)
+import Network.HTTP.ResponseHeader (ResponseHeader, responseHeader)
 import Network.HTTP.StatusCode (StatusCode(..))
 
 -- | The effect type for AJAX requests made with Affjax.
@@ -274,7 +273,7 @@ affjax' req eb cb =
     _ -> hs
 
   cb' :: AffjaxResponse ResponseContent -> Eff (ajax :: AJAX | e) Unit
-  cb' res = case res { response = _  } <$> fromResponse' res.response of
+  cb' res = case res { response = _  } <$> runExcept (fromResponse' res.response) of
     Left err -> eb $ error (show err)
     Right res' -> cb res'
 

src/Network/HTTP/Affjax/Response.purs

@@ -1,27 +1,24 @@
 module Network.HTTP.Affjax.Response
   ( ResponseType(..), responseTypeToString
-  , ResponseContent()
+  , ResponseContent
   , class Respondable, responseType, fromResponse
   ) where
 
 import Prelude
 
-import Data.Argonaut.Core (Json())
+import Data.Argonaut.Core (Json)
 import Data.ArrayBuffer.Types as A
-import Data.Either (Either(..))
-import Data.Foreign (Foreign(), F(), readString, unsafeReadTagged)
+import Data.Foreign (Foreign, F, readString, unsafeReadTagged)
 import Data.Maybe (Maybe(..))
-import Data.MediaType (MediaType())
+import Data.MediaType (MediaType)
 import Data.MediaType.Common (applicationJSON)
 import Data.Tuple (Tuple(..))
 
-import DOM.File.Types (Blob())
-import DOM.Node.Types (Document())
+import DOM.File.Types (Blob)
+import DOM.Node.Types (Document)
 
 import Unsafe.Coerce (unsafeCoerce)
 
-import Control.Monad.Except (except, runExcept)
-
 -- | Valid response types for an AJAX request. This is used to determine the
 -- | `ResponseContent` type for a request. The `a` type variable is a phantom
 -- | type used to associate the `ResponseType` with a particular instance of
@@ -74,20 +71,20 @@ instance responsableDocument :: Respondable Document where
 
 instance responsableForeign :: Respondable Foreign where
   responseType = Tuple Nothing JSONResponse
-  fromResponse = Right <<< unsafeCoerce
+  fromResponse = pure <<< unsafeCoerce
 
 instance responsableString :: Respondable String where
   responseType = Tuple Nothing StringResponse
   fromResponse = readString
 
 instance responsableUnit :: Respondable Unit where
   responseType = Tuple Nothing StringResponse
-  fromResponse = const (except (Right unit))
+  fromResponse = const (pure unit)
 
 instance responsableArrayBuffer :: Respondable A.ArrayBuffer where
   responseType = Tuple Nothing ArrayBufferResponse
   fromResponse = unsafeReadTagged "ArrayBuffer"
 
 instance responsableJson :: Respondable Json where
   responseType = Tuple (Just applicationJSON) JSONResponse
-  fromResponse = Right <<< unsafeCoerce
+  fromResponse = pure <<< unsafeCoerce