hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-957'

Browse Source
This commit is contained in:
Julian Ospald 2024-01-20 16:54:42 +08:00
commit f6cf4cb90c
No known key found for this signature in database
GPG Key ID: 4275CDA6A29BED43
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/GHCup/Errors.hs
View File

@ -212,20 +212,22 @@ data NoDownload = NoDownload GHCTargetVersion Tool (Maybe PlatformRequest)
deriving Show deriving Show
instance Pretty NoDownload where instance Pretty NoDownload where
pPrint (NoDownload tver@(GHCTargetVersion mtarget vv) tool mpfreq) pPrint (NoDownload tver@(GHCTargetVersion mtarget vv) tool mpfreq) =
| (Just target) <- mtarget let helperMsg
, target `elem` (T.pack . prettyShow <$> enumFromTo (minBound :: Tool) (maxBound :: Tool)) | (Just target) <- mtarget
= text $ "Unable to find a download for " , target `elem` (T.pack . prettyShow <$> enumFromTo (minBound :: Tool) (maxBound :: Tool)) =
"\nPerhaps you meant: 'ghcup <command> "
<> T.unpack target
<> " "
<> T.unpack (prettyVer vv)
<> "'"
| otherwise = ""
in text $ "Unable to find a download for "
<> show tool <> show tool
<> " version '" <> " version "
<> T.unpack (tVerToText tver) <> "'" <> T.unpack (tVerToText tver) <> "'"
<> maybe "'\n" (\pfreq -> "' on detected platform " <> pfReqToString pfreq <> "\n") mpfreq <> maybe "" (\pfreq -> " on detected platform " <> pfReqToString pfreq) mpfreq
<> "Perhaps you meant: 'ghcup <command> " <> helperMsg
<> T.unpack target
<> " "
<> T.unpack (prettyVer vv)
<> "'"
| otherwise = text $ "Unable to find a download for " <> T.unpack (tVerToText tver)
instance HFErrorProject NoDownload where instance HFErrorProject NoDownload where
eBase _ = 10 eBase _ = 10
@ -387,7 +389,7 @@ data NotInstalled = NotInstalled Tool GHCTargetVersion
instance Pretty NotInstalled where instance Pretty NotInstalled where
pPrint (NotInstalled tool ver) = pPrint (NotInstalled tool ver) =
text "The version" <+> pPrint ver <+> text "of the tool" <+> pPrint tool <+> text "is not installed." text "The version" <+> (text "'" <> pPrint ver <> text "'") <+> text "of the tool" <+> pPrint tool <+> text "is not installed."
instance HFErrorProject NotInstalled where instance HFErrorProject NotInstalled where
eBase _ = 130 eBase _ = 130