diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/FieldGrammar.hs b/cabal-install/src/Distribution/Client/ProjectConfig/FieldGrammar.hs index f7d49e8bfe3..249f09a2f32 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig/FieldGrammar.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig/FieldGrammar.hs @@ -119,7 +119,7 @@ packageConfigFieldGrammar = <*> optionalFieldDef "static" L.packageConfigStaticLib mempty <*> optionalFieldDef "executable-dynamic" L.packageConfigDynExe mempty <*> optionalFieldDef "executable-static" L.packageConfigFullyStaticExe mempty - <*> optionalFieldDef "profilin" L.packageConfigProf mempty + <*> optionalFieldDef "profiling" L.packageConfigProf mempty <*> optionalFieldDef "library-profiling" L.packageConfigProfLib mempty <*> optionalFieldDef "executable-profiling" L.packageConfigProfExe mempty <*> optionalFieldDef "profiling-detail" L.packageConfigProfDetail mempty @@ -163,8 +163,8 @@ packageConfigFieldGrammar = <*> optionalFieldDefAla "haddock-lib" (alaFlag Token) L.packageConfigHaddockLib mempty <*> optionalFieldDefAla "haddock-output-dir" (alaFlag FilePathNT) L.packageConfigHaddockOutputDir mempty <*> optionalFieldDef "haddock-for-hackage" L.packageConfigHaddockForHackage mempty - <*> optionalFieldDef "human-log" L.packageConfigTestHumanLog mempty - <*> optionalFieldDef "machine-log" L.packageConfigTestMachineLog mempty + <*> optionalFieldDef "test-log" L.packageConfigTestHumanLog mempty + <*> optionalFieldDef "test-machine-log" L.packageConfigTestMachineLog mempty <*> optionalFieldDef "test-show-details" L.packageConfigTestShowDetails mempty <*> optionalFieldDef "test-keep-tix-files" L.packageConfigTestKeepTix mempty <*> optionalFieldDefAla "test-wrapper" (alaFlag FilePathNT) L.packageConfigTestWrapper mempty diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs index b20b4b26402..7815712ce02 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs @@ -197,7 +197,7 @@ readProgramName suffix programDb fieldName = parseProgramName :: FieldSuffix -> FieldName -> Maybe String parseProgramName suffix fieldName = case runParsecParser parser' "" fieldNameStream of - Left err -> trace (show err) Nothing -- TODO should parseWarning Unknown Field fieldName + Left _ -> Nothing Right str -> Just str where parser' = P.manyTill P.anyChar (P.try ((P.string suffix)) <* P.eof)