diff options
| -rw-r--r-- | .hlint.yaml | 1 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Layout.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Interface/Create.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Utils/Json.hs | 2 | ||||
| -rw-r--r-- | haddock-test/src/Test/Haddock.hs | 8 | ||||
| -rw-r--r-- | hypsrc-test/ref/src/Operators.html | 56 | ||||
| -rw-r--r-- | hypsrc-test/src/Operators.hs | 4 |
10 files changed, 29 insertions, 52 deletions
diff --git a/.hlint.yaml b/.hlint.yaml index 4a0c8ddc..b57c494f 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -10,7 +10,6 @@ - ignore: {name: "Move brackets to avoid $"} # 7 hints - ignore: {name: "Move guards forward"} # 1 hint - ignore: {name: "Move map inside list comprehension"} # 2 hints -- ignore: {name: "Redundant $"} # 11 hints - ignore: {name: "Redundant <$>"} # 3 hints - ignore: {name: "Redundant bracket"} # 44 hints - ignore: {name: "Redundant id"} # 1 hint diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs index a8a51e5d..7fa5a443 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs @@ -142,7 +142,7 @@ richToken srcs details Token{..} contexts = concatMap (Set.elems . identInfo) . Map.elems . nodeIdentifiers $ details -- pick an arbitrary non-evidence identifier to hyperlink with - identDet = Map.lookupMin $ Map.filter notEvidence $ nodeIdentifiers $ details + identDet = Map.lookupMin $ Map.filter notEvidence $ nodeIdentifiers details notEvidence = not . any isEvidenceContext . identInfo -- If we have name information, we can make links diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs index 8de1b1b8..2c3da7a9 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs @@ -725,7 +725,7 @@ ppInstanceSigs links splice unicode qual sigs = do L _ rtyp = dropWildCards typ -- Instance methods signatures are synified and thus don't have a useful -- SrcSpan value. Use the methods name location instead. - return $ ppSimpleSig links splice unicode qual HideEmptyContexts (getLocA $ head $ lnames) names rtyp + return $ ppSimpleSig links splice unicode qual HideEmptyContexts (getLocA $ head lnames) names rtyp lookupAnySubdoc :: Eq id1 => id1 -> [(id1, DocForDecl id2)] -> DocForDecl id2 diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs index 18405db8..575249ad 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs @@ -220,7 +220,7 @@ subOrphanInstances pkg qual lnks splice = maybe noHtml wrap . instTable where wrap = ((h1 << "Orphan instances") +++) instTable = fmap (thediv ! [ identifier ("section." ++ id_) ] <<) . subTableSrc pkg qual lnks splice - id_ = makeAnchorId $ "orphans" + id_ = makeAnchorId "orphans" subInstHead :: String -- ^ Instance unique id (for anchor generation) diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index ebddb397..19494c8e 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -474,7 +474,7 @@ instance Parent (ConDecl GhcRn) where instance Parent (TyClDecl GhcRn) where children d | isDataDecl d = map unLoc $ concatMap (getConNames . unLoc) - $ (dd_cons . tcdDataDefn) $ d + $ (dd_cons . tcdDataDefn) d | isClassDecl d = map (unLoc . fdLName . unLoc) (tcdATs d) ++ [ unLoc n | L _ (TypeSig _ ns _) <- tcdSigs d, n <- ns ] diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs index b3796906..17b9f367 100644 --- a/haddock-api/src/Haddock/Interface/Create.hs +++ b/haddock-api/src/Haddock/Interface/Create.hs @@ -331,7 +331,7 @@ mkAliasMap state impDecls = M.fromList $ mapMaybe (\(SrcLoc.L _ impDecl) -> do SrcLoc.L _ alias <- ideclAs impDecl - return $ + return (lookupModuleDyn state -- TODO: This is supremely dodgy, because in general the -- UnitId isn't going to look anything like the package diff --git a/haddock-api/src/Haddock/Utils/Json.hs b/haddock-api/src/Haddock/Utils/Json.hs index 6bcd38fa..0a796b4a 100644 --- a/haddock-api/src/Haddock/Utils/Json.hs +++ b/haddock-api/src/Haddock/Utils/Json.hs @@ -400,7 +400,7 @@ parseIntegralFromDouble d = let r = toRational d x = truncate r in if toRational x == r - then pure $ x + then pure x else fail $ "unexpected floating number " <> show d parseIntegral :: Integral a => String -> Value -> Parser a diff --git a/haddock-test/src/Test/Haddock.hs b/haddock-test/src/Test/Haddock.hs index 1019e815..fe547ad5 100644 --- a/haddock-test/src/Test/Haddock.hs +++ b/haddock-test/src/Test/Haddock.hs @@ -89,9 +89,9 @@ runHaddock cfg@(Config { .. }) = do , pure $ "--odir=" ++ outDir cfgDirConfig tpkg , tpkgFiles tpkg ] - , pcEnv = Just $ cfgEnv - , pcStdOut = Just $ haddockStdOut - , pcStdErr = Just $ haddockStdOut + , pcEnv = Just cfgEnv + , pcStdOut = Just haddockStdOut + , pcStdErr = Just haddockStdOut } let msg = "Failed to run Haddock on test package '" ++ tpkgName tpkg ++ "'" @@ -159,7 +159,7 @@ diffFile cfg diff file = do hFlush stdout handle <- runProcess' diff $ processConfig { pcArgs = [outFile', refFile'] - , pcStdOut = Just $ stdout + , pcStdOut = Just stdout } waitForProcess handle >> return () where diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html index 04006a0d..8519d9de 100644 --- a/hypsrc-test/ref/src/Operators.html +++ b/hypsrc-test/ref/src/Operators.html @@ -33,11 +33,6 @@ </span ><span id="line-4" ></span - ><span - > -</span - ><span id="line-5" - ></span ><span id="" ><span class="annot" ><a href="Operators.html#%2B%2B%2B" @@ -97,7 +92,7 @@ ><span > </span - ><span id="line-6" + ><span id="line-5" ></span ><span id="" ><span class="annot" @@ -196,12 +191,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-7" + ><span id="line-6" ></span ><span > </span - ><span id="line-8" + ><span id="line-7" ></span ><span id="" ><span class="annot" @@ -262,7 +257,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-9" + ><span id="line-8" ></span ><span id="" ><span class="annot" @@ -342,12 +337,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-10" + ><span id="line-9" ></span ><span > </span - ><span id="line-11" + ><span id="line-10" ></span ><span id="" ><span class="annot" @@ -408,7 +403,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-12" + ><span id="line-11" ></span ><span id="%2A%2A%2A" ><span class="annot" @@ -458,7 +453,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-13" + ><span id="line-12" ></span ><span class="annot" ><a href="Operators.html#%2A%2A%2A" @@ -575,12 +570,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-14" + ><span id="line-13" ></span ><span > </span - ><span id="line-15" + ><span id="line-14" ></span ><span id="" ><span class="annot" @@ -645,7 +640,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-16" + ><span id="line-15" ></span ><span id="" ><span class="annot" @@ -739,12 +734,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-17" + ><span id="line-16" ></span ><span > </span - ><span id="line-18" + ><span id="line-17" ></span ><span id="" ><span class="annot" @@ -817,7 +812,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-19" + ><span id="line-18" ></span ><span id="" ><span class="annot" @@ -961,17 +956,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-20" - ></span - ><span - > -</span - ><span id="line-21" + ><span id="line-19" ></span ><span > </span - ><span id="line-22" + ><span id="line-20" ></span ><span id="" ><span id="" @@ -1054,7 +1044,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-23" + ><span id="line-21" ></span ><span id="" ><span class="annot" @@ -1109,16 +1099,6 @@ forall a b. a -> b -> a ></span ><span > </span - ><span class="annot" - ><span class="annottext" - >((a, b) -> c -> (a, b)) -> (a, b) -> c -> (a, b) -forall a b. (a -> b) -> a -> b -</span - ><span class="hs-operator hs-var" - >$</span - ></span - ><span - > </span ><span class="hs-special" >(</span ><span class="annot" @@ -1148,7 +1128,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-24" + ><span id="line-22" ></span ></pre ></body diff --git a/hypsrc-test/src/Operators.hs b/hypsrc-test/src/Operators.hs index 1dcb8856..82c4da04 100644 --- a/hypsrc-test/src/Operators.hs +++ b/hypsrc-test/src/Operators.hs @@ -1,7 +1,6 @@ {-# LANGUAGE Haskell2010 #-} module Operators where - (+++) :: [a] -> [a] -> [a] a +++ b = a ++ b ++ a @@ -18,6 +17,5 @@ a */\* b = concatMap (*** b) a (**/\**) :: [[a]] -> [[a]] -> [[a]] a **/\** b = zipWith (*/\*) [a +++ b] (a $$$ b) - (#.#) :: a -> b -> (c -> (a, b)) -a #.# b = const $ (a, b) +a #.# b = const (a, b) |