LTS update, warning cleanup

This commit is contained in:
Michael Snoyman 2015-03-26 18:50:38 +02:00
parent 55880e0f15
commit 4ec9caab59
7 changed files with 268 additions and 268 deletions

View File

@ -33,8 +33,6 @@ instance FromJSON DeprecationRecord where
package <- PackageName <$> (obj .: "deprecated-package") package <- PackageName <$> (obj .: "deprecated-package")
inFavourOf <- map PackageName <$> (obj .: "in-favour-of") inFavourOf <- map PackageName <$> (obj .: "in-favour-of")
return $ DeprecationRecord package inFavourOf return $ DeprecationRecord package inFavourOf
where
parsePackageName = fmap PackageName
toDeprecated :: DeprecationRecord -> Deprecated toDeprecated :: DeprecationRecord -> Deprecated
toDeprecated (DeprecationRecord deprecated _) = Deprecated deprecated toDeprecated (DeprecationRecord deprecated _) = Deprecated deprecated

View File

@ -14,7 +14,6 @@ module Data.Slug
import ClassyPrelude.Yesod import ClassyPrelude.Yesod
import Database.Persist.Sql (PersistFieldSql (sqlType)) import Database.Persist.Sql (PersistFieldSql (sqlType))
import qualified System.Random.MWC as MWC import qualified System.Random.MWC as MWC
import GHC.Prim (RealWorld)
import Text.Blaze (ToMarkup) import Text.Blaze (ToMarkup)
newtype Slug = Slug Text newtype Slug = Slug Text

View File

@ -24,7 +24,6 @@ import qualified Data.Yaml as Y
import System.IO (IOMode (ReadMode), withBinaryFile, openBinaryFile) import System.IO (IOMode (ReadMode), withBinaryFile, openBinaryFile)
import System.IO.Temp (withSystemTempFile, withTempFile, withSystemTempDirectory) import System.IO.Temp (withSystemTempFile, withTempFile, withSystemTempDirectory)
import System.Exit (ExitCode (ExitSuccess)) import System.Exit (ExitCode (ExitSuccess))
import System.Process (createProcess, proc, cwd, waitForProcess)
import qualified Filesystem.Path.CurrentOS as F import qualified Filesystem.Path.CurrentOS as F
import Data.Conduit.Zlib (gzip, ungzip) import Data.Conduit.Zlib (gzip, ungzip)
import qualified Data.ByteString.Base16 as B16 import qualified Data.ByteString.Base16 as B16

View File

@ -14,16 +14,13 @@ import Settings.StaticFiles
import qualified System.Random.MWC as MWC import qualified System.Random.MWC as MWC
import Text.Blaze import Text.Blaze
import Text.Hamlet (hamletFile) import Text.Hamlet (hamletFile)
import Text.Jasmine (minifym)
import Types import Types
import Yesod.Auth import Yesod.Auth
import Yesod.Auth.BrowserId import Yesod.Auth.BrowserId
import Yesod.Auth.GoogleEmail2 import Yesod.Auth.GoogleEmail2 (authGoogleEmail)
import Yesod.Core.Types (Logger, GWData) import Yesod.Core.Types (Logger, GWData)
import Yesod.Default.Config import Yesod.Default.Config
import Yesod.Default.Util (addStaticContentExternal)
import Yesod.GitRepo import Yesod.GitRepo
import Stackage.Types
-- | The site argument for your application. This can be a good place to -- | The site argument for your application. This can be a good place to
-- keep settings and values requiring initialization before your application -- keep settings and values requiring initialization before your application
@ -215,7 +212,7 @@ instance YesodAuth App where
, userDisplay = credsIdent creds , userDisplay = credsIdent creds
, userToken = token , userToken = token
} }
void $ insert Email insert_ Email
{ emailEmail = credsIdent creds { emailEmail = credsIdent creds
, emailUser = userid , emailUser = userid
} }
@ -224,7 +221,7 @@ instance YesodAuth App where
memail <- getBy $ UniqueEmail $ credsIdent creds memail <- getBy $ UniqueEmail $ credsIdent creds
case memail of case memail of
Nothing -> do Nothing -> do
void $ insert Email insert_ Email
{ emailEmail = credsIdent creds { emailEmail = credsIdent creds
, emailUser = uid , emailUser = uid
} }

View File

@ -1,7 +1,7 @@
{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE ConstraintKinds #-}
module Handler.BuildPlan where module Handler.BuildPlan where
import Import hiding (get, PackageName (..), Version (..)) import Import hiding (get, PackageName (..), Version (..), DList)
import Data.Slug (SnapSlug) import Data.Slug (SnapSlug)
import qualified Filesystem as F import qualified Filesystem as F
import Data.Yaml (decodeFileEither) import Data.Yaml (decodeFileEither)

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,6 @@ import Test.Hspec.QuickCheck
import Data.Slug import Data.Slug
import ClassyPrelude.Yesod import ClassyPrelude.Yesod
import qualified System.Random.MWC as MWC import qualified System.Random.MWC as MWC
import Control.Monad.Reader (runReaderT)
spec :: Spec spec :: Spec
spec = describe "Data.Slug" $ do spec = describe "Data.Slug" $ do