Fix haddock parse error

I run haddock with `cabal haddock --executables`. It fails with:

    Types/Remote.hs:271:17: error: parse error on input ‘->’

Apparently haddock does not like to find haddock blocks outside of
declarations? In any case, this patch makes these type of errors go
away.

Afterwards, I see errors like these, that need to be investigated as
a next step:

haddock: internal error: internal: extractDecl
CallStack (from HasCallStack):
  error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1116:12 in main:Haddock.Interface.Create
This commit is contained in:
Thomas Koch 2020-05-11 08:40:13 +02:00
parent 2d8c8868ef
commit 8a0480daf3
2 changed files with 7 additions and 6 deletions

View file

@ -13,12 +13,13 @@ import Annex.Version
import Annex.Init import Annex.Init
cmd :: Command cmd :: Command
cmd = dontCheck repoExists $ cmd = dontCheck
-- ^ because an old version may not seem to exist -- because an old version may not seem to exist
-- and also, this avoids automatic silent upgrades before -- and also, this avoids automatic silent upgrades before
-- this command can start up. -- this command can start up.
repoExists $
-- avoid upgrading repo out from under daemon
noDaemonRunning $ noDaemonRunning $
-- ^ avoid upgrading repo out from under daemon
command "upgrade" SectionMaintenance "upgrade repository" command "upgrade" SectionMaintenance "upgrade repository"
paramNothing (seek <$$> optParser) paramNothing (seek <$$> optParser)

View file

@ -266,10 +266,10 @@ data ImportActions a = ImportActions
, retrieveExportWithContentIdentifier , retrieveExportWithContentIdentifier
:: ExportLocation :: ExportLocation
-> ContentIdentifier -> ContentIdentifier
-- file to write content to
-> FilePath -> FilePath
-- ^ file to write content to -- callback that generates a key from the downloaded content
-> a (Maybe Key) -> a (Maybe Key)
-- ^ callback that generates a key from the downloaded content
-> MeterUpdate -> MeterUpdate
-> a (Maybe Key) -> a (Maybe Key)
-- Exports content to an ExportLocation, and returns the -- Exports content to an ExportLocation, and returns the
@ -292,8 +292,8 @@ data ImportActions a = ImportActions
:: FilePath :: FilePath
-> Key -> Key
-> ExportLocation -> ExportLocation
-- old content that it's safe to overwrite
-> [ContentIdentifier] -> [ContentIdentifier]
-- ^ old content that it's safe to overwrite
-> MeterUpdate -> MeterUpdate
-> a (Either String ContentIdentifier) -> a (Either String ContentIdentifier)
-- This is used rather than removeExport when a special remote -- This is used rather than removeExport when a special remote