fix: build

Author: leana8959

cabal-install/src/Distribution/Client/BuildReports/Anonymous.hs

@@ -40,7 +40,6 @@ import Distribution.Client.Version (cabalInstallVersion)
 import Distribution.Compiler (CompilerId (..))
 import Distribution.FieldGrammar
 import Distribution.Fields
-import Distribution.Fields.Field
 import Distribution.Package (PackageIdentifier (..), mkPackageName)
 import Distribution.PackageDescription (FlagAssignment)
 import Distribution.Parsec
@@ -147,9 +146,8 @@ parseBuildReport s = case snd $ runParseResult $ parseFields s of
 parseFields :: BS.ByteString -> ParseResult src BuildReport
 parseFields input = do
   fields <- either (parseFatalFailure zeroPos . show) pure $ readFields input
-  let fields' = map (fmap unComments) fields
-  case partitionFields fields' of
-    (fields'', []) -> parseFieldGrammar CabalSpecV2_4 fields'' fieldDescrs
+  case partitionFields fields of
+    (fields', []) -> parseFieldGrammar CabalSpecV2_4 fields' fieldDescrs
     _otherwise -> parseFatalFailure zeroPos "found sections in BuildReport"
 
 parseBuildReportList :: BS.ByteString -> [BuildReport]

cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs

@@ -30,7 +30,7 @@ import Distribution.FieldGrammar
 import Distribution.FieldGrammar.Parsec (NamelessField (..), namelessFieldAnn)
 import Distribution.Fields (Field (..), FieldLine (..), FieldName, Name (..), SectionArg (..), readFields')
 import Distribution.Fields.ConfVar (parseConditionConfVar)
-import Distribution.Fields.Field (fieldLinesToString, sectionArgAnn, unComments)
+import Distribution.Fields.Field (fieldLinesToString, sectionArgAnn)
 import Distribution.Fields.LexerMonad (toPWarnings)
 import Distribution.Fields.ParseResult
 import Distribution.Parsec (ParsecParser, eitherParsec, parsec, parsecFilePath, runParsecParser)
@@ -75,8 +75,7 @@ readPreprocessFields bs = do
       parseWarnings (toPWarnings lexWarnings)
       for_ invalidUtf8 $ \pos ->
         parseWarning zeroPos PWTUTF $ "UTF8 encoding problem at byte offset " ++ show pos
-      let fs' = map (fmap unComments) fs
-      return fs'
+      return fs
     Left perr -> parseFatalFailure pos (show perr)
       where
         ppos = Text.Parsec.errorPos perr

cabal-install/src/Distribution/Client/ScriptUtils.hs

@@ -100,9 +100,6 @@ import Distribution.Fields
   , parseFatalFailure
   , readFields
   )
-import Distribution.Fields.Field
-  ( unComments
-  )
 import Distribution.PackageDescription
   ( ignoreConditions
   )
@@ -484,8 +481,7 @@ parseScriptBlock :: BS.ByteString -> ParseResult src Executable
 parseScriptBlock str =
   case readFields str of
     Right fs -> do
-      let fs' = map (fmap unComments) fs
-      let (fields, _) = takeFields fs'
+      let (fields, _) = takeFields fs
       parseFieldGrammar cabalSpecLatest fields (executableFieldGrammar "script")
     Left perr -> parseFatalFailure pos (show perr)
       where

cabal-install/src/Distribution/Deprecated/ParseUtils.hs

@@ -422,10 +422,9 @@ lineNo (Section n _ _ _) = n
 readFields :: BS.ByteString -> ParseResult [Field]
 readFields input = case Fields.readFields' input of
   Right (fs, ws) ->
-    let fs' = map (fmap Fields.unComments) fs
-     in ParseOk
-          [PWarning msg | Fields.PWarning _ _ msg <- Fields.toPWarnings ws]
-          (legacyFields fs')
+      ParseOk
+       [PWarning msg | Fields.PWarning _ _ msg <- Fields.toPWarnings ws]
+       (legacyFields fs)
   Left perr ->
     ParseFailed $
       NoParse