From ccc84570bb47165e11cf2e1f68bc973f30913cd6 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Mon, 1 Jan 2024 08:57:52 -0500 Subject: [PATCH] Rename to abbreviateOptions --- .../src/Distribution/Solver/Modular/Message.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cabal-install-solver/src/Distribution/Solver/Modular/Message.hs b/cabal-install-solver/src/Distribution/Solver/Modular/Message.hs index 0041caa09..0b81b7771 100644 --- a/cabal-install-solver/src/Distribution/Solver/Modular/Message.hs +++ b/cabal-install-solver/src/Distribution/Solver/Modular/Message.hs @@ -226,7 +226,7 @@ showQSNBool a q b = show a ++ Flag.showQSNBool q b showOptions :: ProgressAction -> QPN -> [POption] -> String showOptions a q [p] = show a ++ showOption q p -showOptions a q ps = show a ++ abbreviatePkgVers q ps +showOptions a q ps = show a ++ abbreviateOptions q ps showOption :: QPN -> POption -> String showOption qpn@(Q _pp pn) (POption i linkedTo) = @@ -235,16 +235,16 @@ showOption qpn@(Q _pp pn) (POption i linkedTo) = Just pp' -> showQPN qpn ++ "~>" ++ showPI (PI (Q pp' pn) i) -- | --- >>> abbreviatePkgVers fooQPN [v0, v1, v2] +-- >>> abbreviateOptions fooQPN [v0, v1, v2] -- "foo; 1.0.2, 1.0.1, 1.0.0" --- >>> abbreviatePkgVers fooQPN [v0] +-- >>> abbreviateOptions fooQPN [v0] -- "foo-1.0.0" --- >>> abbreviatePkgVers fooQPN [] +-- >>> abbreviateOptions fooQPN [] -- "unexpected empty list of versions" -abbreviatePkgVers :: QPN -> [POption] -> String -abbreviatePkgVers _ [] = "unexpected empty list of versions" -abbreviatePkgVers q [x] = showOption q x -abbreviatePkgVers q (reverse -> xs) +abbreviateOptions :: QPN -> [POption] -> String +abbreviateOptions _ [] = "unexpected empty list of versions" +abbreviateOptions q [x] = showOption q x +abbreviateOptions q (reverse -> xs) | any (\(POption (instI -> b0) (isJust -> b1)) -> b0 || b1) xs = showQPN q ++ L.intercalate ", " (showOption q `map` xs) | otherwise = showQPN q ++ "; " ++ L.intercalate ", " ((\(POption (showI -> v) _) -> v) `map` xs) -- 2.11.4.GIT