diff --git a/package.yaml b/package.yaml index 64f2272c..3eacda2f 100644 --- a/package.yaml +++ b/package.yaml @@ -149,6 +149,7 @@ tests: - directory - firefly - http-types + - lens - modern-uri - nyan-interpolation - o-clock diff --git a/src/Xrefcheck/Config.hs b/src/Xrefcheck/Config.hs index 263b4306..0c130196 100644 --- a/src/Xrefcheck/Config.hs +++ b/src/Xrefcheck/Config.hs @@ -11,9 +11,9 @@ module Xrefcheck.Config , defConfigText ) where -import Universum +import Universum hiding ((.~)) -import Control.Lens (makeLensesWith) +import Control.Lens (makeLensesWith, (.~)) import Data.Aeson (genericParseJSON) import Data.Yaml (FromJSON (..), decodeEither', prettyPrintParseException, withText) import Text.Regex.TDFA.Text () diff --git a/src/Xrefcheck/Core.hs b/src/Xrefcheck/Core.hs index 2379cb9c..9519e1ac 100644 --- a/src/Xrefcheck/Core.hs +++ b/src/Xrefcheck/Core.hs @@ -9,9 +9,9 @@ module Xrefcheck.Core where -import Universum +import Universum hiding ((^..)) -import Control.Lens (folded, makeLenses, makePrisms, to, united) +import Control.Lens (folded, makeLenses, makePrisms, to, united, (^..)) import Data.Aeson (FromJSON (..), withText) import Data.Char (isAlphaNum) import Data.Char qualified as C diff --git a/src/Xrefcheck/Scan.hs b/src/Xrefcheck/Scan.hs index 54ff7f59..1c686428 100644 --- a/src/Xrefcheck/Scan.hs +++ b/src/Xrefcheck/Scan.hs @@ -31,9 +31,9 @@ module Xrefcheck.Scan , scanRepo ) where -import Universum +import Universum hiding (_1, (%~)) -import Control.Lens (makeLensesWith) +import Control.Lens (makeLensesWith, _1, (%~)) import Data.Aeson (FromJSON (..), genericParseJSON, withText) import Data.Map qualified as M import Data.Reflection (Given) diff --git a/src/Xrefcheck/Scanners/Markdown.hs b/src/Xrefcheck/Scanners/Markdown.hs index 0c3480e9..d3cc6962 100644 --- a/src/Xrefcheck/Scanners/Markdown.hs +++ b/src/Xrefcheck/Scanners/Markdown.hs @@ -16,11 +16,11 @@ module Xrefcheck.Scanners.Markdown , makeError ) where -import Universum +import Universum hiding (use) import CMarkGFM (Node (..), NodeType (..), PosInfo (..), commonmarkToNode, extAutolink, optFootnotes) -import Control.Lens (_Just, makeLenses, makeLensesFor, (.=)) +import Control.Lens (_Just, makeLenses, makeLensesFor, use, (.=)) import Control.Monad.Trans.Writer.CPS (Writer, runWriter, tell) import Data.Aeson (FromJSON (..), genericParseJSON) import Data.ByteString.Lazy qualified as BSL diff --git a/src/Xrefcheck/Util.hs b/src/Xrefcheck/Util.hs index 47d8fc12..022532e8 100644 --- a/src/Xrefcheck/Util.hs +++ b/src/Xrefcheck/Util.hs @@ -17,9 +17,9 @@ module Xrefcheck.Util , module Xrefcheck.Util.Interpolate ) where -import Universum +import Universum hiding ((.~)) -import Control.Lens (LensRules, lensField, lensRules, mappingNamer) +import Control.Lens (LensRules, lensField, lensRules, mappingNamer, (.~)) import Data.Aeson qualified as Aeson import Data.Aeson.Casing (aesonPrefix, camelCase) import Data.Fixed (Fixed (MkFixed), HasResolution (resolution)) diff --git a/tests/Test/Xrefcheck/IgnoreRegexSpec.hs b/tests/Test/Xrefcheck/IgnoreRegexSpec.hs index c6af37e9..b727c4ba 100644 --- a/tests/Test/Xrefcheck/IgnoreRegexSpec.hs +++ b/tests/Test/Xrefcheck/IgnoreRegexSpec.hs @@ -5,8 +5,9 @@ module Test.Xrefcheck.IgnoreRegexSpec where -import Universum +import Universum hiding ((^.)) +import Control.Lens ((^.)) import Data.Reflection (give) import Data.Yaml (decodeEither') import Test.Tasty (TestTree, testGroup)