Browse Source

quell ghc warnings

master
Philipp Balzarek 13 years ago
parent
commit
4d5343037c
  1. 10
      source/Network/Xmpp/Concurrent/Threads.hs
  2. 1
      source/Network/Xmpp/Sasl/Types.hs
  3. 4
      source/Network/Xmpp/Types.hs

10
source/Network/Xmpp/Concurrent/Threads.hs

@ -24,7 +24,7 @@ readWorker :: (Stanza -> IO ())
-> (XmppFailure -> IO ()) -> (XmppFailure -> IO ())
-> TMVar Stream -> TMVar Stream
-> IO a -> IO a
readWorker onStanza onConnectionClosed stateRef = forever . Ex.mask_ $ do readWorker onStanza onCClosed stateRef = forever . Ex.mask_ $ do
s' <- Ex.catches ( do s' <- Ex.catches ( do
-- we don't know whether pull will -- we don't know whether pull will
@ -54,8 +54,8 @@ readWorker onStanza onConnectionClosed stateRef = forever . Ex.mask_ $ do
, Ex.Handler $ \(e :: XmppFailure) -> do , Ex.Handler $ \(e :: XmppFailure) -> do
errorM "Pontarius.Xmpp" $ "Read error: " errorM "Pontarius.Xmpp" $ "Read error: "
++ show e ++ show e
closeStreams s _ <- closeStreams s
onConnectionClosed e onCClosed e
return Nothing return Nothing
] ]
case res of case res of
@ -63,8 +63,8 @@ readWorker onStanza onConnectionClosed stateRef = forever . Ex.mask_ $ do
-- do. TODO: Can this happen? -- do. TODO: Can this happen?
Just (Left e) -> do Just (Left e) -> do
errorM "Pontarius.Xmpp" $ "Stanza error:" ++ show e errorM "Pontarius.Xmpp" $ "Stanza error:" ++ show e
closeStreams s _ <- closeStreams s
onConnectionClosed e onCClosed e
Just (Right sta) -> void $ onStanza sta Just (Right sta) -> void $ onStanza sta
where where
-- Defining an Control.Exception.allowInterrupt equivalent for GHC 7 -- Defining an Control.Exception.allowInterrupt equivalent for GHC 7

1
source/Network/Xmpp/Sasl/Types.hs

@ -1,7 +1,6 @@
{-# OPTIONS_HADDOCK hide #-} {-# OPTIONS_HADDOCK hide #-}
module Network.Xmpp.Sasl.Types where module Network.Xmpp.Sasl.Types where
import Control.Monad.Error
import Control.Monad.State.Strict import Control.Monad.State.Strict
import Data.ByteString(ByteString) import Data.ByteString(ByteString)
import qualified Data.Text as Text import qualified Data.Text as Text

4
source/Network/Xmpp/Types.hs

@ -69,7 +69,7 @@ import qualified Data.Attoparsec.Text as AP
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Data.Conduit import Data.Conduit
import Data.Default import Data.Default
import Data.Maybe (fromJust, maybeToList) import Data.Maybe (maybeToList)
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.String (IsString(..)) import Data.String (IsString(..))
import Data.Text (Text) import Data.Text (Text)
@ -946,7 +946,7 @@ instance Read Jid where
[] -> error "Expected `parseJid \"<jid>\"'" [] -> error "Expected `parseJid \"<jid>\"'"
[("parseJid", r')] -> case lex r' of [("parseJid", r')] -> case lex r' of
[] -> error "Expected `parseJid \"<jid>\"'" [] -> error "Expected `parseJid \"<jid>\"'"
[(s', r)] -> (s', r) [(s'', r'')] -> (s'', r'')
_ -> error "Expected `parseJid \"<jid>\"'" _ -> error "Expected `parseJid \"<jid>\"'"
_ -> error "Expected `parseJid \"<jid>\"'" _ -> error "Expected `parseJid \"<jid>\"'"
-- Read the JID string (removes the quotes), validate, and return. -- Read the JID string (removes the quotes), validate, and return.

Loading…
Cancel
Save