From c20fc1fa3c513ea9352a3a5808b57b8d28916a24 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 28 Aug 2011 12:38:48 +0300 Subject: [PATCH] Remove warnings --- OpenId2/Discovery.hs | 11 +++++------ OpenId2/XRDS.hs | 2 +- Web/Authenticate/BrowserId.hs | 1 - Web/Authenticate/Internal.hs | 2 -- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenId2/Discovery.hs b/OpenId2/Discovery.hs index d91e4ea8..725aa9f1 100644 --- a/OpenId2/Discovery.hs +++ b/OpenId2/Discovery.hs @@ -25,16 +25,15 @@ import OpenId2.XRDS import Debug.Trace -- Libraries import Data.Char -import Data.List import Data.Maybe import Network.HTTP.Enumerator import qualified Data.ByteString.Char8 as S8 -import Control.Arrow (first, (***)) +import Control.Arrow (first) import Control.Monad.IO.Class (MonadIO (liftIO)) import Control.Failure (Failure (failure)) import Control.Monad (mplus, liftM) import qualified Data.CaseInsensitive as CI -import Data.Text (Text, pack, unpack) +import Data.Text (Text, unpack) import Data.Text.Lazy (toStrict) import qualified Data.Text as T import Data.Text.Lazy.Encoding (decodeUtf8With) @@ -136,7 +135,7 @@ parseHTML ident = resolve . mapMaybe linkTag . parseTags where - isOpenId (rel, x) = "openid" `T.isPrefixOf` rel + isOpenId (rel, _x) = "openid" `T.isPrefixOf` rel resolve1 ls = do server <- lookup "openid.server" ls let delegate = lookup "openid.delegate" ls @@ -151,6 +150,6 @@ parseHTML ident = resolve -- | Filter out link tags from a list of html tags. ---linkTags :: [Tag Text] -> [(Text, Text)] +linkTag :: Tag Text -> Maybe (Text, Text) linkTag (TagOpen "link" as) = let x = (,) <$> lookup "rel" as <*> lookup "href" as in traceShow x x -linkTag x = Nothing +linkTag _x = Nothing diff --git a/OpenId2/XRDS.hs b/OpenId2/XRDS.hs index ed0d40b9..1c966469 100644 --- a/OpenId2/XRDS.hs +++ b/OpenId2/XRDS.hs @@ -23,7 +23,7 @@ module OpenId2.XRDS ( import Control.Monad ((>=>)) import Data.Maybe (listToMaybe) import Text.XML.Enumerator.Resolved (parseLBS, decodeEntities) -import Text.XML.Enumerator.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute, node) +import Text.XML.Enumerator.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute) import qualified Data.ByteString.Lazy as L import Data.Text (Text) import qualified Data.Text.Read diff --git a/Web/Authenticate/BrowserId.hs b/Web/Authenticate/BrowserId.hs index 1dc0cf01..8f9cb5f9 100644 --- a/Web/Authenticate/BrowserId.hs +++ b/Web/Authenticate/BrowserId.hs @@ -6,7 +6,6 @@ module Web.Authenticate.BrowserId import Data.Text (Text) import Network.HTTP.Enumerator (parseUrl, responseBody, httpLbs, withManager, method, urlEncodedBody) -import Network.HTTP.Types (queryTextToQuery) import Data.Aeson (json, Value (Object, String)) import Data.Attoparsec.Lazy (parse, maybeResult) import qualified Data.Map as Map diff --git a/Web/Authenticate/Internal.hs b/Web/Authenticate/Internal.hs index 84d7d9ee..1cf83b10 100644 --- a/Web/Authenticate/Internal.hs +++ b/Web/Authenticate/Internal.hs @@ -3,8 +3,6 @@ module Web.Authenticate.Internal ( AuthenticateException (..) ) where -import Numeric (showHex) -import Data.List (intercalate) import Data.Typeable (Typeable) import Control.Exception (Exception)