From 8a0480daf3f02e35379ecf0399dec8d57e770772 Mon Sep 17 00:00:00 2001
From: Thomas Koch <thomas@koch.ro>
Date: Mon, 11 May 2020 08:40:13 +0200
Subject: [PATCH] Fix haddock parse error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 Command/Upgrade.hs | 7 ++++---
 Types/Remote.hs    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 2b343d9188..ffdf3682f6 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -13,12 +13,13 @@ import Annex.Version
 import Annex.Init
 
 cmd :: Command
-cmd = dontCheck repoExists $
-	-- ^ because an old version may not seem to exist
+cmd = dontCheck
+	-- because an old version may not seem to exist
 	-- and also, this avoids automatic silent upgrades before
 	-- this command can start up.
+	repoExists $
+	-- avoid upgrading repo out from under daemon
 	noDaemonRunning $
-	-- ^ avoid upgrading repo out from under daemon
 	command "upgrade" SectionMaintenance "upgrade repository"
 		paramNothing (seek <$$> optParser)
 
diff --git a/Types/Remote.hs b/Types/Remote.hs
index 7e09f0beb4..ed5ccb8fb1 100644
--- a/Types/Remote.hs
+++ b/Types/Remote.hs
@@ -266,10 +266,10 @@ data ImportActions a = ImportActions
 	, retrieveExportWithContentIdentifier 
 		:: ExportLocation
 		-> ContentIdentifier
+		-- file to write content to
 		-> FilePath
-		-- ^ file to write content to
+		-- callback that generates a key from the downloaded content
 		-> a (Maybe Key)
-		-- ^ callback that generates a key from the downloaded content
 		-> MeterUpdate
 		-> a (Maybe Key)
 	-- Exports content to an ExportLocation, and returns the
@@ -292,8 +292,8 @@ data ImportActions a = ImportActions
 		:: FilePath
 		-> Key
 		-> ExportLocation
+		-- old content that it's safe to overwrite
 		-> [ContentIdentifier]
-		-- ^ old content that it's safe to overwrite
 		-> MeterUpdate
 		-> a (Either String ContentIdentifier)
 	-- This is used rather than removeExport when a special remote