diff --git a/.hlint.yaml b/.hlint.yaml index 93407e80..cf1c77a5 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -11,7 +11,6 @@ - ignore: {name: "Use camelCase"} - ignore: {name: "Redundant $"} - ignore: {name: "Redundant bracket"} -- ignore: {name: "Functor law"} - ignore: {name: "Use catMaybes"} - ignore: {name: "Use <$>"} - ignore: {name: "Eta reduce"} diff --git a/src/HIE/Bios/Config.hs b/src/HIE/Bios/Config.hs index 334a308f..b59f9256 100644 --- a/src/HIE/Bios/Config.hs +++ b/src/HIE/Bios/Config.hs @@ -1,10 +1,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TupleSections #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE LambdaCase #-} -- | Logic and datatypes for parsing @hie.yaml@ files. module HIE.Bios.Config( readConfig, diff --git a/src/HIE/Bios/Cradle.hs b/src/HIE/Bios/Cradle.hs index d82998d1..80240d2e 100644 --- a/src/HIE/Bios/Cradle.hs +++ b/src/HIE/Bios/Cradle.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} diff --git a/src/HIE/Bios/Types.hs b/src/HIE/Bios/Types.hs index b68eb9e3..14d6d203 100644 --- a/src/HIE/Bios/Types.hs +++ b/src/HIE/Bios/Types.hs @@ -1,12 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE DeriveFunctor #-} -{-# LANGUAGE DeriveTraversable #-} -{-# LANGUAGE DeriveFoldable #-} -{-# OPTIONS_GHC -Wno-orphans #-} - -{-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveTraversable #-} module HIE.Bios.Types where @@ -54,7 +48,7 @@ data ActionName a | Other a deriving (Show, Eq, Ord, Functor) -data Log = +data Log = LogAny String | LogProcessOutput String deriving Show @@ -148,7 +142,7 @@ instance Fail.MonadFail m => Fail.MonadFail (CradleLoadResultT m) where #endif instance MonadTrans CradleLoadResultT where - lift = CradleLoadResultT . liftM CradleSuccess + lift = CradleLoadResultT . fmap CradleSuccess {-# INLINE lift #-} instance (MonadIO m) => MonadIO (CradleLoadResultT m) where