Skip to content

Commit

Permalink
Improved indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanGlScott committed Jul 16, 2014
1 parent 43f4327 commit 4c07f70
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions Web/Scotty/Action.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ module Web.Scotty.Action
, runAction
) where

import Blaze.ByteString.Builder (Builder, fromLazyByteString)
import Blaze.ByteString.Builder (Builder, fromLazyByteString)

#if MIN_VERSION_mtl(2,2,1)
import Control.Monad.Except
#else
import Control.Monad.Error
#endif
import Control.Monad.Reader
import Control.Monad.Reader
import qualified Control.Monad.State as MS

import qualified Data.Aeson as A
Expand All @@ -51,11 +51,11 @@ import qualified Data.Text as ST
import qualified Data.Text.Lazy as T
import Data.Text.Lazy.Encoding (encodeUtf8)

import Network.HTTP.Types
import Network.Wai
import Network.HTTP.Types
import Network.Wai

import Web.Scotty.Internal.Types
import Web.Scotty.Util
import Web.Scotty.Internal.Types
import Web.Scotty.Util

-- Nothing indicates route failed (due to Next) and pattern matching should continue.
-- Just indicates a successful response.
Expand Down
20 changes: 10 additions & 10 deletions Web/Scotty/Route.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module Web.Scotty.Route
capture, regex, function, literal
) where

import Control.Arrow ((***))
import Control.Concurrent.MVar
import Control.Arrow ((***))
import Control.Concurrent.MVar
#if MIN_VERSION_mtl(2,2,1)
import Control.Monad.Except
#else
Expand All @@ -16,21 +16,21 @@ import qualified Control.Monad.State as MS

import qualified Data.ByteString.Char8 as B
import qualified Data.ByteString.Lazy.Char8 as BL
import Data.Maybe (fromMaybe)
import Data.Monoid (mconcat)
import Data.String (fromString)
import Data.Maybe (fromMaybe)
import Data.Monoid (mconcat)
import Data.String (fromString)
import qualified Data.Text.Lazy as T
import qualified Data.Text as TS

import Network.HTTP.Types
import Network.Wai (Request(..))
import Network.HTTP.Types
import Network.Wai (Request(..))
import qualified Network.Wai.Parse as Parse hiding (parseRequestBody)

import qualified Text.Regex as Regex

import Web.Scotty.Action
import Web.Scotty.Internal.Types
import Web.Scotty.Util
import Web.Scotty.Action
import Web.Scotty.Internal.Types
import Web.Scotty.Util

-- | get = 'addroute' 'GET'
get :: (ScottyError e, MonadIO m) => RoutePattern -> ActionT e m () -> ScottyT e m ()
Expand Down

0 comments on commit 4c07f70

Please sign in to comment.