From 62fffd9f3ec8a1bcddfee2f01222228be4b0dce0 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Mon, 1 Jun 2020 12:46:10 +0100 Subject: [PATCH] Cosmetic fixes --- Cabal/Distribution/Simple/BuildTarget.hs | 2 +- cabal-install/Distribution/Client/CmdShowBuildInfo.hs | 8 ++++---- .../PackageTests/ShowBuildInfo/A/cabal.project | 2 +- cabal-testsuite/PackageTests/ShowBuildInfo/B/src/A.hs | 2 +- .../PackageTests/ShowBuildInfo/Complex/cabal.project | 2 +- .../PackageTests/ShowBuildInfo/Complex/test/Main.hs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cabal/Distribution/Simple/BuildTarget.hs b/Cabal/Distribution/Simple/BuildTarget.hs index 0b367db9ac8..a6e6cdbd619 100644 --- a/Cabal/Distribution/Simple/BuildTarget.hs +++ b/Cabal/Distribution/Simple/BuildTarget.hs @@ -66,7 +66,7 @@ import System.Directory ( doesFileExist, doesDirectoryExist ) import qualified Data.Map as Map -- | Take a list of 'String' build targets, and parse and validate them --- into actual 'TargetInfo's to be built/registered/whatever. +-- into actual 'TargetInfo's to be built\/registered\/whatever. readTargetInfos :: Verbosity -> PackageDescription -> LocalBuildInfo -> [String] -> IO [TargetInfo] readTargetInfos verbosity pkg_descr lbi args = do build_targets <- readBuildTargets verbosity pkg_descr args diff --git a/cabal-install/Distribution/Client/CmdShowBuildInfo.hs b/cabal-install/Distribution/Client/CmdShowBuildInfo.hs index d05a8c1cd5e..98e0a72f855 100644 --- a/cabal-install/Distribution/Client/CmdShowBuildInfo.hs +++ b/cabal-install/Distribution/Client/CmdShowBuildInfo.hs @@ -219,7 +219,7 @@ showInfo fileOutput verbosity baseCtx buildCtx lock pkgs targetUnitId = -- Check cabal version is correct (cabalVersion, _, _) <- getSetupMethod verbosity scriptOptions (elabPkgDescription pkg) buildType' - when (cabalVersion < mkVersion [3, 0, 0,0]) + when (cabalVersion < mkVersion [3, 0, 0, 0]) ( die' verbosity $ "Only a Cabal version >= 3.0.0.0 is supported for this command.\n" ++ "Found version: " ++ display cabalVersion ++ "\n" ++ "For component: " ++ display targetUnitId @@ -318,8 +318,8 @@ reportTargetProblems verbosity = renderTargetProblem :: TargetProblem -> String renderTargetProblem (TargetProblemCommon problem) = - renderTargetProblemCommon "build" problem + renderTargetProblemCommon "show-build-info" problem renderTargetProblem (TargetProblemNoneEnabled targetSelector targets) = - renderTargetProblemNoneEnabled "build" targetSelector targets + renderTargetProblemNoneEnabled "show-build-info" targetSelector targets renderTargetProblem(TargetProblemNoTargets targetSelector) = - renderTargetProblemNoTargets "build" targetSelector + renderTargetProblemNoTargets "show-build-info" targetSelector diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/cabal.project b/cabal-testsuite/PackageTests/ShowBuildInfo/A/cabal.project index 5356e76f67c..e6fdbadb439 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/cabal.project +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/cabal.project @@ -1 +1 @@ -packages: . \ No newline at end of file +packages: . diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/B/src/A.hs b/cabal-testsuite/PackageTests/ShowBuildInfo/B/src/A.hs index ad7a0c07729..6b02eec8ec0 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/B/src/A.hs +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/B/src/A.hs @@ -1,4 +1,4 @@ module A where foo :: Int -> Int -foo = id \ No newline at end of file +foo = id diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/cabal.project b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/cabal.project index 5356e76f67c..e6fdbadb439 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/cabal.project +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/cabal.project @@ -1 +1 @@ -packages: . \ No newline at end of file +packages: . diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/test/Main.hs b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/test/Main.hs index 3ef47688534..b3549c2fe3d 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/test/Main.hs +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/test/Main.hs @@ -1 +1 @@ -main = return () \ No newline at end of file +main = return ()