Fix whitespace violations in Haskell sources

    find . -name "*hs" | xargs fix-whitespace

Author: andreasabel

Network/Browser.hs

@@ -18,10 +18,10 @@
 --
 -- This module provides definitions for the standard buffer types that the
 -- package supports, i.e., for @String@ and @ByteString@ (strict and lazy.)
--- 
+--
 -----------------------------------------------------------------------------
 module Network.BufferType
-       ( 
+       (
          BufferType(..)
 
        , BufferOp(..)
@@ -44,7 +44,7 @@ import Network.HTTP.Utils ( crlf, lf )
 -- that the library requires to operate over data embedded in HTTP
 -- requests and responses. That is, we use explicit dictionaries
 -- for the operations, but overload the name of the dicts themselves.
--- 
+--
 class BufferType bufType where
    bufferOps :: BufferOp bufType
 
@@ -57,7 +57,7 @@ instance BufferType Strict.ByteString where
 instance BufferType String where
    bufferOps = stringBufferOp
 
--- | @BufferOp@ encodes the I/O operations of the underlying buffer over 
+-- | @BufferOp@ encodes the I/O operations of the underlying buffer over
 -- a Handle in an (explicit) dictionary type. May not be needed, but gives
 -- us flexibility in explicit overriding and wrapping up of these methods.
 --
@@ -67,7 +67,7 @@ instance BufferType String where
 --
 -- We supply three default @BufferOp@ values, for @String@ along with the
 -- strict and lazy versions of @ByteString@. To add others, provide @BufferOp@
--- definitions for 
+-- definitions for
 data BufferOp a
  = BufferOp
      { buf_hGet         :: Handle -> Int -> IO a
@@ -92,8 +92,8 @@ instance Eq (BufferOp a) where
 -- | @strictBufferOp@ is the 'BufferOp' definition over @ByteString@s,
 -- the non-lazy kind.
 strictBufferOp :: BufferOp Strict.ByteString
-strictBufferOp = 
-    BufferOp 
+strictBufferOp =
+    BufferOp
       { buf_hGet         = Strict.hGet
       , buf_hGetContents = Strict.hGetContents
       , buf_hPut         = Strict.hPut
@@ -108,7 +108,7 @@ strictBufferOp =
       , buf_empty        = Strict.empty
       , buf_isLineTerm   = \ b -> Strict.length b == 2 && p_crlf == b ||
                                   Strict.length b == 1 && p_lf   == b
-      , buf_isEmpty      = Strict.null 
+      , buf_isEmpty      = Strict.null
       }
    where
     p_crlf = Strict.pack crlf
@@ -117,8 +117,8 @@ strictBufferOp =
 -- | @lazyBufferOp@ is the 'BufferOp' definition over @ByteString@s,
 -- the non-strict kind.
 lazyBufferOp :: BufferOp Lazy.ByteString
-lazyBufferOp = 
-    BufferOp 
+lazyBufferOp =
+    BufferOp
       { buf_hGet         = Lazy.hGet
       , buf_hGetContents = Lazy.hGetContents
       , buf_hPut         = Lazy.hPut
@@ -133,7 +133,7 @@ lazyBufferOp =
       , buf_empty        = Lazy.empty
       , buf_isLineTerm   = \ b -> Lazy.length b == 2 && p_crlf == b ||
                                   Lazy.length b == 1 && p_lf   == b
-      , buf_isEmpty      = Lazy.null 
+      , buf_isEmpty      = Lazy.null
       }
    where
     p_crlf = Lazy.pack crlf
@@ -143,7 +143,7 @@ lazyBufferOp =
 -- It is defined in terms of @strictBufferOp@ operations,
 -- unpacking/converting to @String@ when needed.
 stringBufferOp :: BufferOp String
-stringBufferOp =BufferOp 
+stringBufferOp =BufferOp
       { buf_hGet         = \ h n -> buf_hGet strictBufferOp h n >>= return . Strict.unpack
       , buf_hGetContents = \ h -> buf_hGetContents strictBufferOp h >>= return . Strict.unpack
       , buf_hPut         = \ h s -> buf_hPut strictBufferOp h (Strict.pack s)
@@ -154,11 +154,11 @@ stringBufferOp =BufferOp
       , buf_toStr        = id
       , buf_snoc         = \ a x -> a ++ [toEnum (fromIntegral x)]
       , buf_splitAt      = splitAt
-      , buf_span         = \ p a -> 
+      , buf_span         = \ p a ->
                              case Strict.span p (Strict.pack a) of
                                (x,y) -> (Strict.unpack x, Strict.unpack y)
       , buf_empty        = []
       , buf_isLineTerm   = \ b -> b == crlf || b == lf
-      , buf_isEmpty      = null 
+      , buf_isEmpty      = null
       }
 

Network/BufferType.hs

@@ -3,7 +3,7 @@
 -- Module      :  Network.HTTP
 -- Copyright   :  See LICENSE file
 -- License     :  BSD
--- 
+--
 -- Maintainer  :  Ganesh Sittampalam <[email protected]>
 -- Stability   :  experimental
 -- Portability :  non-portable (not tested)
@@ -27,31 +27,31 @@
 -- namespace, letting you either use the default implementation here
 -- by importing @Network.HTTP@ or, for more specific uses, selectively
 -- import the modules in @Network.HTTP.*@. To wit, more than one kind of
--- representation of the bulk data that flows across a HTTP connection is 
+-- representation of the bulk data that flows across a HTTP connection is
 -- supported. (see "Network.HTTP.HandleStream".)
--- 
+--
 -- /NOTE:/ The 'Request' send actions will normalize the @Request@ prior to transmission.
 -- Normalization such as having the request path be in the expected form and, possibly,
 -- introduce a default @Host:@ header if one isn't already present.
 -- Normalization also takes the @"user:pass\@"@ portion out of the the URI,
 -- if it was supplied, and converts it into @Authorization: Basic$ header.
--- If you do not 
+-- If you do not
 -- want the requests tampered with, but sent as-is, please import and use the
 -- the "Network.HTTP.HandleStream" or "Network.HTTP.Stream" modules instead. They
--- export the same functions, but leaves construction and any normalization of 
+-- export the same functions, but leaves construction and any normalization of
 -- @Request@s to the user.
 --
 -- /NOTE:/ This package only supports HTTP; it does not support HTTPS.
 -- Attempts to use HTTPS result in an error.
 -----------------------------------------------------------------------------
-module Network.HTTP 
+module Network.HTTP
        ( module Network.HTTP.Base
        , module Network.HTTP.Headers
 
-         {- the functionality that the implementation modules, 
-	    Network.HTTP.HandleStream and Network.HTTP.Stream,
-	    exposes:
-	 -}
+         {- the functionality that the implementation modules,
+            Network.HTTP.HandleStream and Network.HTTP.Stream,
+            exposes:
+         -}
        , simpleHTTP      -- :: Request -> IO (Result Response)
        , simpleHTTP_     -- :: Stream s => s -> Request -> IO (Result Response)
        , sendHTTP        -- :: Stream s => s -> Request -> IO (Result Response)
@@ -60,12 +60,12 @@ module Network.HTTP
        , respondHTTP     -- :: Stream s => s -> Response -> IO ()
 
        , module Network.TCP
-       
+
        , getRequest      -- :: String -> Request_String
        , headRequest     -- :: String -> Request_String
        , postRequest     -- :: String -> Request_String
        , postRequestWithBody -- :: String -> String -> String -> Request_String
-       
+
        , getResponseBody -- :: Result (Request ty) -> IO ty
        , getResponseCode -- :: Result (Request ty) -> IO ResponseCode
        ) where
@@ -109,10 +109,10 @@ simpleHTTP r = do
   c <- openStream (host auth) (fromMaybe 80 (port auth))
   let norm_r = normalizeRequest defaultNormalizeRequestOptions{normDoClose=True} r
   simpleHTTP_ c norm_r
-   
+
 -- | Identical to 'simpleHTTP', but acting on an already opened stream.
 simpleHTTP_ :: HStream ty => HandleStream ty -> Request ty -> IO (Result (Response ty))
-simpleHTTP_ s r = do 
+simpleHTTP_ s r = do
   let norm_r = normalizeRequest defaultNormalizeRequestOptions{normDoClose=True} r
   S.sendHTTP s norm_r
 
@@ -121,7 +121,7 @@ simpleHTTP_ s r = do
 -- closed upon receiving the response.
 sendHTTP :: HStream ty => HandleStream ty -> Request ty -> IO (Result (Response ty))
 sendHTTP conn rq = do
-  let norm_r = normalizeRequest defaultNormalizeRequestOptions rq 
+  let norm_r = normalizeRequest defaultNormalizeRequestOptions rq
   S.sendHTTP conn norm_r
 
 -- | @sendHTTP_notify hStream httpRequest action@ behaves like 'sendHTTP', but
@@ -134,7 +134,7 @@ sendHTTP_notify :: HStream ty
                 -> IO ()
                 -> IO (Result (Response ty))
 sendHTTP_notify conn rq onSendComplete = do
-  let norm_r = normalizeRequest defaultNormalizeRequestOptions rq 
+  let norm_r = normalizeRequest defaultNormalizeRequestOptions rq
   S.sendHTTP_notify conn norm_r onSendComplete
 
 -- | @receiveHTTP hStream@ reads a 'Request' from the 'HandleStream' @hStream@
@@ -154,7 +154,7 @@ respondHTTP conn rsp = S.respondHTTP conn rsp
 getRequest
     :: String             -- ^URL to fetch
     -> Request_String     -- ^The constructed request
-getRequest urlString = 
+getRequest urlString =
   case parseURI urlString of
     Nothing -> error ("getRequest: Not a valid URL - " ++ urlString)
     Just u  -> mkRequest GET u
@@ -165,7 +165,7 @@ getRequest urlString =
 headRequest
     :: String             -- ^URL to fetch
     -> Request_String     -- ^The constructed request
-headRequest urlString = 
+headRequest urlString =
   case parseURI urlString of
     Nothing -> error ("headRequest: Not a valid URL - " ++ urlString)
     Just u  -> mkRequest HEAD u
@@ -176,7 +176,7 @@ headRequest urlString =
 postRequest
     :: String                   -- ^URL to POST to
     -> Request_String           -- ^The constructed request
-postRequest urlString = 
+postRequest urlString =
   case parseURI urlString of
     Nothing -> error ("postRequest: Not a valid URL - " ++ urlString)
     Just u  -> mkRequest POST u
@@ -193,7 +193,7 @@ postRequestWithBody
     -> String                      -- ^Content-Type of body
     -> String                      -- ^The body of the request
     -> Request_String              -- ^The constructed request
-postRequestWithBody urlString typ body = 
+postRequestWithBody urlString typ body =
   case parseURI urlString of
     Nothing -> error ("postRequestWithBody: Not a valid URL - " ++ urlString)
     Just u  -> setRequestBody (mkRequest POST u) (typ, body)
@@ -222,29 +222,29 @@ getResponseCode (Right r)  = return (rspCode r)
 --     - comm timeouts
 --     - MIME & entity stuff (happening in separate module)
 --     - support \"*\" uri-request-string for OPTIONS request method
--- 
--- 
+--
+--
 -- * Header notes:
 --
 --     [@Host@]
 --                  Required by HTTP\/1.1, if not supplied as part
 --                  of a request a default Host value is extracted
 --                  from the request-uri.
--- 
---     [@Connection@] 
+--
+--     [@Connection@]
 --                  If this header is present in any request or
 --                  response, and it's value is "close", then
---                  the current request\/response is the last 
+--                  the current request\/response is the last
 --                  to be allowed on that connection.
--- 
+--
 --     [@Expect@]
 --                  Should a request contain a body, an Expect
 --                  header will be added to the request.  The added
 --                  header has the value \"100-continue\".  After
 --                  a 417 \"Expectation Failed\" response the request
 --                  is attempted again without this added Expect
 --                  header.
---                  
+--
 --     [@TransferEncoding,ContentLength,...@]
 --                  if request is inconsistent with any of these
 --                  header values then you may not receive any response
@@ -257,7 +257,7 @@ getResponseCode (Right r)  = return (rspCode r)
 --   [@1xx@]   \"100 Continue\" will cause any unsent request body to be sent.
 --             \"101 Upgrade\" will be returned.
 --             Other 1xx responses are ignored.
--- 
+--
 --   [@417@]   The reason for this code is \"Expectation failed\", indicating
 --             that the server did not like the Expect \"100-continue\" header
 --             added to a request.  Receipt of 417 will induce another

Network/HTTP.hs

@@ -4,14 +4,14 @@
 -- Module      :  Network.HTTP.Auth
 -- Copyright   :  See LICENSE file
 -- License     :  BSD
--- 
+--
 -- Maintainer  :  Ganesh Sittampalam <[email protected]>
 -- Stability   :  experimental
 -- Portability :  non-portable (not tested)
 --
 -- Representing HTTP Auth values in Haskell.
 -- Right now, it contains mostly functionality needed by 'Network.Browser'.
--- 
+--
 -----------------------------------------------------------------------------
 module Network.HTTP.Auth
        ( Authority(..)
@@ -38,7 +38,7 @@ import Data.Word ( Word8 )
 
 -- | @Authority@ specifies the HTTP Authentication method to use for
 -- a given domain/realm; @Basic@ or @Digest@.
-data Authority 
+data Authority
  = AuthBasic { auRealm    :: String
              , auUsername :: String
              , auPassword :: String
@@ -55,7 +55,7 @@ data Authority
              }
 
 
-data Challenge 
+data Challenge
  = ChalBasic  { chRealm   :: String }
  | ChalDigest { chRealm   :: String
               , chDomain  :: [URI]
@@ -74,13 +74,13 @@ instance Show Algorithm where
     show AlgMD5 = "md5"
     show AlgMD5sess = "md5-sess"
 
--- | 
+-- |
 data Qop = QopAuth | QopAuthInt
     deriving(Eq,Show)
 
 -- | @withAuthority auth req@ generates a credentials value from the @auth@ 'Authority',
 -- in the context of the given request.
--- 
+--
 -- If a client nonce was to be used then this function might need to be of type ... -> BrowserAction String
 withAuthority :: Authority -> Request ty -> String
 withAuthority a rq = case a of
@@ -104,7 +104,7 @@ withAuthority a rq = case a of
 
         a1, a2 :: String
         a1 = auUsername a ++ ":" ++ auRealm a ++ ":" ++ auPassword a
-        
+
         {-
         If the "qop" directive's value is "auth" or is unspecified, then A2
         is:
@@ -135,7 +135,7 @@ kd a b = md5 (a ++ ":" ++ b)
 
 
 
--- | @headerToChallenge base www_auth@ tries to convert the @WWW-Authenticate@ header 
+-- | @headerToChallenge base www_auth@ tries to convert the @WWW-Authenticate@ header
 -- @www_auth@  into a 'Challenge' value.
 headerToChallenge :: URI -> Header -> Maybe Challenge
 headerToChallenge baseURI (Header _ str) =
@@ -173,12 +173,12 @@ headerToChallenge baseURI (Header _ str) =
             -- with Maybe monad
             do { r <- lookup "realm" params
                ; n <- lookup "nonce" params
-               ; return $ 
+               ; return $
                     ChalDigest { chRealm  = r
-                               , chDomain = (annotateURIs 
+                               , chDomain = (annotateURIs
                                             $ map parseURI
-                                            $ words 
-                                            $ fromMaybe [] 
+                                            $ words
+                                            $ fromMaybe []
                                             $ lookup "domain" params)
                                , chNonce  = n
                                , chOpaque = lookup "opaque" params