From b2737a64159ab24ee4700316d4b50c2ff3109918 Mon Sep 17 00:00:00 2001 From: Mitchell Rosen Date: Mon, 8 Jan 2024 10:45:18 -0500 Subject: [PATCH] update wording and transcripts --- .../src/Unison/CommandLine/OutputMessages.hs | 20 +++++++------------ unison-src/transcripts/fix4482.output.md | 6 +++--- .../transcripts/upgrade-sad-path.output.md | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs index 6580cb8db7..2946bd1d3b 100644 --- a/unison-cli/src/Unison/CommandLine/OutputMessages.hs +++ b/unison-cli/src/Unison/CommandLine/OutputMessages.hs @@ -2222,19 +2222,13 @@ notifyUser dir = \case <> "again." ] UpgradeFailure path old new -> - pure $ - P.wrap - ( "I couldn't automatically upgrade" - <> P.text (NameSegment.toText old) - <> "to" - <> P.group (P.text (NameSegment.toText new) <> ".") - ) - <> P.newline - <> P.newline - <> P.wrap - ( "I added the problematic definitions to the top of" - <> P.group (prettyFilePath path <> ".") - ) + pure . P.wrap $ + "I couldn't automatically upgrade" + <> P.text (NameSegment.toText old) + <> "to" + <> P.group (P.text (NameSegment.toText new) <> ".") + <> "However, I've added the definitions that need attention to the top of" + <> P.group (prettyFilePath path <> ".") UpgradeSuccess old new -> pure . P.wrap $ "I upgraded" diff --git a/unison-src/transcripts/fix4482.output.md b/unison-src/transcripts/fix4482.output.md index 4c15df436a..e4add34f0a 100644 --- a/unison-src/transcripts/fix4482.output.md +++ b/unison-src/transcripts/fix4482.output.md @@ -57,8 +57,8 @@ myproj/main> upgrade foo0 foo1 use lib.foo0.lib.bonk1 bar ##Nat.+ bar bar - I couldn't automatically upgrade foo0 to foo1. - - I added the problematic definitions to the top of scratch.u. + I couldn't automatically upgrade foo0 to foo1. However, I've + added the definitions that need attention to the top of + scratch.u. ``` diff --git a/unison-src/transcripts/upgrade-sad-path.output.md b/unison-src/transcripts/upgrade-sad-path.output.md index ef2eeb72b0..2a86de1563 100644 --- a/unison-src/transcripts/upgrade-sad-path.output.md +++ b/unison-src/transcripts/upgrade-sad-path.output.md @@ -37,8 +37,8 @@ proj/main> upgrade old new use Nat + foo + 10 - I couldn't automatically upgrade old to new. - - I added the problematic definitions to the top of scratch.u. + I couldn't automatically upgrade old to new. However, I've + added the definitions that need attention to the top of + scratch.u. ```