From 9af023b8ba578745ba1c148192f50a4c3ea0bc0d Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Tue, 2 Jul 2024 09:46:40 -0700 Subject: [PATCH] Fixup resolution-failures.md --- unison-src/transcripts/resolution-failures.md | 4 ++++ .../transcripts/resolution-failures.output.md | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/unison-src/transcripts/resolution-failures.md b/unison-src/transcripts/resolution-failures.md index eff751b4a..b9b97c999 100644 --- a/unison-src/transcripts/resolution-failures.md +++ b/unison-src/transcripts/resolution-failures.md @@ -4,6 +4,10 @@ This transcript tests the errors printed to the user when a name cannot be resol ## Codebase Setup +```ucm +scratch/main> builtins.merge lib.builtins +``` + First we define differing types with the same name in different namespaces: ```unison diff --git a/unison-src/transcripts/resolution-failures.output.md b/unison-src/transcripts/resolution-failures.output.md index bca703a4e..d2c239c02 100644 --- a/unison-src/transcripts/resolution-failures.output.md +++ b/unison-src/transcripts/resolution-failures.output.md @@ -4,6 +4,12 @@ This transcript tests the errors printed to the user when a name cannot be resol ## Codebase Setup +```ucm +scratch/main> builtins.merge lib.builtins + + Done. + +``` First we define differing types with the same name in different namespaces: ```unison @@ -26,8 +32,8 @@ two.ambiguousTerm = "term two" type one.AmbiguousType type two.AmbiguousType - one.ambiguousTerm : ##Text - two.ambiguousTerm : ##Text + one.ambiguousTerm : Text + two.ambiguousTerm : Text ``` ```ucm @@ -37,8 +43,8 @@ scratch/main> add type one.AmbiguousType type two.AmbiguousType - one.ambiguousTerm : ##Text - two.ambiguousTerm : ##Text + one.ambiguousTerm : Text + two.ambiguousTerm : Text ``` ## Tests @@ -114,7 +120,7 @@ useAmbiguousTerm = ambiguousTerm I found some terms in scope that have matching names and types. Maybe you meant one of these: - one.ambiguousTerm : ##Text - two.ambiguousTerm : ##Text + one.ambiguousTerm : Text + two.ambiguousTerm : Text ```