From 400111f9a025be1c7faac32004f453d6ae7f598a Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Tue, 23 Jan 2018 08:12:51 -0500 Subject: [PATCH] Restyle imports --- src/Yesod/Auth/OAuth2.hs | 6 +++--- src/Yesod/Auth/OAuth2/Bitbucket.hs | 4 ++-- src/Yesod/Auth/OAuth2/Github.hs | 2 +- src/Yesod/Auth/OAuth2/Nylas.hs | 10 +++++----- src/Yesod/Auth/OAuth2/Spotify.hs | 2 +- src/Yesod/Auth/OAuth2/Upcase.hs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Yesod/Auth/OAuth2.hs b/src/Yesod/Auth/OAuth2.hs index e2e1dbb..cf29b69 100644 --- a/src/Yesod/Auth/OAuth2.hs +++ b/src/Yesod/Auth/OAuth2.hs @@ -29,11 +29,11 @@ import Control.Applicative ((<$>)) #endif import Control.Exception.Lifted -import Control.Monad.IO.Class import Control.Monad (unless) +import Control.Monad.IO.Class import Data.Aeson (Value(..), encode) -import Data.Monoid ((<>)) import Data.ByteString (ByteString) +import Data.Monoid ((<>)) import Data.Text (Text, pack) import Data.Text.Encoding (encodeUtf8) import Data.Typeable @@ -45,8 +45,8 @@ import URI.ByteString.Extension import Yesod.Auth import Yesod.Core -import qualified Data.Text as T import qualified Data.ByteString.Lazy as BL +import qualified Data.Text as T -- | Provider name and Aeson parse error data YesodOAuth2Exception = InvalidProfileResponse Text BL.ByteString diff --git a/src/Yesod/Auth/OAuth2/Bitbucket.hs b/src/Yesod/Auth/OAuth2/Bitbucket.hs index 799d7c1..eb6ca99 100644 --- a/src/Yesod/Auth/OAuth2/Bitbucket.hs +++ b/src/Yesod/Auth/OAuth2/Bitbucket.hs @@ -21,11 +21,11 @@ import Control.Applicative ((<$>), (<*>)) import Control.Exception.Lifted (throwIO) import Control.Monad (mzero) import Data.Aeson (FromJSON, Value(Object), parseJSON, (.:), (.:?)) -import Data.Maybe (fromMaybe) import Data.List (find) +import Data.Maybe (fromMaybe) import Data.Text (Text) import Network.HTTP.Conduit (Manager) -import Yesod.Auth (YesodAuth, Creds(..), AuthPlugin) +import Yesod.Auth (AuthPlugin, Creds(..), YesodAuth) import Yesod.Auth.OAuth2 import qualified Data.Text as T diff --git a/src/Yesod/Auth/OAuth2/Github.hs b/src/Yesod/Auth/OAuth2/Github.hs index 45767e8..d4b8f8f 100644 --- a/src/Yesod/Auth/OAuth2/Github.hs +++ b/src/Yesod/Auth/OAuth2/Github.hs @@ -21,8 +21,8 @@ import Control.Applicative ((<$>), (<*>)) import Control.Exception.Lifted import Control.Monad (mzero) import Data.Aeson -import Data.Maybe (fromMaybe) import Data.List (find) +import Data.Maybe (fromMaybe) import Data.Text (Text) import Network.HTTP.Conduit (Manager) import Yesod.Auth diff --git a/src/Yesod/Auth/OAuth2/Nylas.hs b/src/Yesod/Auth/OAuth2/Nylas.hs index 1146e40..1b1f9c3 100644 --- a/src/Yesod/Auth/OAuth2/Nylas.hs +++ b/src/Yesod/Auth/OAuth2/Nylas.hs @@ -10,15 +10,15 @@ module Yesod.Auth.OAuth2.Nylas import Control.Applicative ((<$>), (<*>)) #endif -import Control.Monad (mzero) import Control.Exception.Lifted (throwIO) -import Data.Aeson (FromJSON, Value(..), parseJSON, decode, (.:)) +import Control.Monad (mzero) +import Data.Aeson (FromJSON, Value(..), decode, parseJSON, (.:)) import Data.Text (Text) import Data.Text.Encoding (encodeUtf8) -import Network.HTTP.Client (applyBasicAuth, httpLbs, parseRequest, responseBody, - responseStatus) +import Network.HTTP.Client + (applyBasicAuth, httpLbs, parseRequest, responseBody, responseStatus) import Network.HTTP.Conduit (Manager) -import Yesod.Auth (Creds(..), YesodAuth, AuthPlugin) +import Yesod.Auth (AuthPlugin, Creds(..), YesodAuth) import Yesod.Auth.OAuth2 import qualified Network.HTTP.Types as HT diff --git a/src/Yesod/Auth/OAuth2/Spotify.hs b/src/Yesod/Auth/OAuth2/Spotify.hs index cfd8953..7bb328e 100644 --- a/src/Yesod/Auth/OAuth2/Spotify.hs +++ b/src/Yesod/Auth/OAuth2/Spotify.hs @@ -10,7 +10,7 @@ module Yesod.Auth.OAuth2.Spotify ) where #if __GLASGOW_HASKELL__ < 710 -import Control.Applicative ((<$>), (<*>), pure) +import Control.Applicative (pure, (<$>), (<*>)) #endif import Control.Monad (mzero) diff --git a/src/Yesod/Auth/OAuth2/Upcase.hs b/src/Yesod/Auth/OAuth2/Upcase.hs index 8e38f53..4acd935 100644 --- a/src/Yesod/Auth/OAuth2/Upcase.hs +++ b/src/Yesod/Auth/OAuth2/Upcase.hs @@ -20,9 +20,9 @@ import Control.Applicative ((<$>), (<*>)) import Control.Monad (mzero) import Data.Aeson import Data.Text (Text) +import qualified Data.Text as T import Yesod.Auth import Yesod.Auth.OAuth2 -import qualified Data.Text as T data UpcaseUser = UpcaseUser { upcaseUserId :: Int