Skip to content

Commit 5b08451

Browse files
mitchellwrosenmitchellwrosen
authored
Merge pull request #5784 from unisonweb/pchiusano-patch-2
Change slurp output to just say "New definitions:"
2 parents 65fc68b + f8b0732 commit 5b08451

File tree

239 files changed

+481
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+481
-481
lines changed

‎unison-cli/src/Unison/Codebase/Editor/SlurpResult.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pretty isPast ppe sr =
207207
okToAdd =
208208
ok
209209
(P.green "I've added these definitions:")
210-
(P.green "These new definitions are ok to `update`:")
210+
(P.green "New definitions:")
211211
notOks _past _present sr | isOk sr = mempty
212212
notOks past present sr =
213213
let header =

‎unison-src/transcripts-manual/docs.to-html.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ some.outside = 3
2121
I found and typechecked these definitions in scratch.u. If you
2222
do an `update`, here's how your codebase would change:
2323
24-
⍟ These new definitions are ok to `update`:
24+
⍟ New definitions:
2525
2626
some.ns.direct : Nat
2727
some.ns.direct.doc : Doc2

‎unison-src/transcripts-round-trip/main.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ x = ()
2424
I found and typechecked these definitions in scratch.u. If you
2525
do an `update`, here's how your codebase would change:
2626
27-
⍟ These new definitions are ok to `update`:
27+
⍟ New definitions:
2828
2929
x : ()
3030
```

‎unison-src/transcripts-using-base/_base.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ testAutoClean _ =
5757
I found and typechecked these definitions in scratch.u. If you
5858
do an `update`, here's how your codebase would change:
5959
60-
⍟ These new definitions are ok to `update`:
60+
⍟ New definitions:
6161
6262
testAutoClean : '{IO} [Result]
6363
```

‎unison-src/transcripts-using-base/binary-encoding-nats.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ testABunchOfNats _ =
5959
I found and typechecked these definitions in scratch.u. If you
6060
do an `update`, here's how your codebase would change:
6161
62-
⍟ These new definitions are ok to `update`:
62+
⍟ New definitions:
6363
6464
type EncDec
6565
BE16 : EncDec

‎unison-src/transcripts-using-base/codeops.output.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ swapped name link =
157157
I found and typechecked these definitions in scratch.u. If you
158158
do an `update`, here's how your codebase would change:
159159
160-
⍟ These new definitions are ok to `update`:
160+
⍟ New definitions:
161161
162162
structural type Three a b c
163163
Code.get : Link.Term ->{IO, Throw Text} Code
@@ -286,7 +286,7 @@ badLoad _ =
286286
I found and typechecked these definitions in scratch.u. If you
287287
do an `update`, here's how your codebase would change:
288288
289-
⍟ These new definitions are ok to `update`:
289+
⍟ New definitions:
290290
291291
structural ability Zap
292292
badLoad : '{IO} [Result]
@@ -388,7 +388,7 @@ codeTests =
388388
I found and typechecked these definitions in scratch.u. If you
389389
do an `update`, here's how your codebase would change:
390390
391-
⍟ These new definitions are ok to `update`:
391+
⍟ New definitions:
392392
393393
codeTests : '{IO} [Result]
394394
```
@@ -473,7 +473,7 @@ vtests _ =
473473
I found and typechecked these definitions in scratch.u. If you
474474
do an `update`, here's how your codebase would change:
475475
476-
⍟ These new definitions are ok to `update`:
476+
⍟ New definitions:
477477
478478
validateTest : Link.Term ->{IO} Result
479479
vtests : '{IO} [Result]

‎unison-src/transcripts-using-base/doc.output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ unique type time.DayOfWeek = Sun | Mon | Tue | Wed | Thu | Fri | Sat
3434
I found and typechecked these definitions in scratch.u. If you
3535
do an `update`, here's how your codebase would change:
3636
37-
⍟ These new definitions are ok to `update`:
37+
⍟ New definitions:
3838
3939
type time.DayOfWeek
4040
ImportantConstant : Nat
@@ -80,7 +80,7 @@ scratch/main> load ./unison-src/transcripts-using-base/doc.md.files/syntax.u
8080
./unison-src/transcripts-using-base/doc.md.files/syntax.u. If
8181
you do an `update`, here's how your codebase would change:
8282
83-
⍟ These new definitions are ok to `update`:
83+
⍟ New definitions:
8484
8585
basicFormatting : Doc2
8686
doc.guide : Doc2

‎unison-src/transcripts-using-base/failure-tests.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test2 = do
2424
I found and typechecked these definitions in scratch.u. If you
2525
do an `update`, here's how your codebase would change:
2626
27-
⍟ These new definitions are ok to `update`:
27+
⍟ New definitions:
2828
2929
test1 : '{IO, Exception} [Result]
3030
test2 : '{IO, Exception} [Result]

‎unison-src/transcripts-using-base/fix-2805.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ main _ = "Hello " ++ Optional.getOrBug "definitely passed an arg" (List.head !ge
1111
I found and typechecked these definitions in scratch.u. If you
1212
do an `update`, here's how your codebase would change:
1313
14-
⍟ These new definitions are ok to `update`:
14+
⍟ New definitions:
1515
1616
main : '{IO, Exception} Text
1717
```

‎unison-src/transcripts-using-base/fix2158-1.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Async.parMap f as =
1717
I found and typechecked these definitions in scratch.u. If you
1818
do an `update`, here's how your codebase would change:
1919
20-
⍟ These new definitions are ok to `update`:
20+
⍟ New definitions:
2121
2222
structural ability Async t g
2323
Async.parMap : (a ->{g, Async t g} b)

‎unison-src/transcripts-using-base/fix2358.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ timingApp2 _ =
1414
I found and typechecked these definitions in scratch.u. If you
1515
do an `update`, here's how your codebase would change:
1616
17-
⍟ These new definitions are ok to `update`:
17+
⍟ New definitions:
1818
1919
timingApp2 : '{IO, Exception} ()
2020
```

‎unison-src/transcripts-using-base/fix2944.output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ability Foo where
1212
I found and typechecked these definitions in scratch.u. If you
1313
do an `update`, here's how your codebase would change:
1414
15-
⍟ These new definitions are ok to `update`:
15+
⍟ New definitions:
1616
1717
ability Foo
1818
```
@@ -40,7 +40,7 @@ bar = {{
4040
I found and typechecked these definitions in scratch.u. If you
4141
do an `update`, here's how your codebase would change:
4242
43-
⍟ These new definitions are ok to `update`:
43+
⍟ New definitions:
4444
4545
bar : Doc2
4646
```

‎unison-src/transcripts-using-base/fix3166.output.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ increment n = 1 + n
3737
I found and typechecked these definitions in scratch.u. If you
3838
do an `update`, here's how your codebase would change:
3939
40-
⍟ These new definitions are ok to `update`:
40+
⍟ New definitions:
4141
4242
Stream.fromList : [a] -> '{Stream a} ()
4343
Stream.map : (a -> b)
@@ -86,7 +86,7 @@ foo _ =
8686
I found and typechecked these definitions in scratch.u. If you
8787
do an `update`, here's how your codebase would change:
8888
89-
⍟ These new definitions are ok to `update`:
89+
⍟ New definitions:
9090
9191
structural ability E
9292
foo : '{E} (Nat -> Nat)
@@ -128,7 +128,7 @@ hmm =
128128
I found and typechecked these definitions in scratch.u. If you
129129
do an `update`, here's how your codebase would change:
130130
131-
⍟ These new definitions are ok to `update`:
131+
⍟ New definitions:
132132
133133
structural ability Over
134134
delegated : ∀ _. _ -> Nat -> Nat

‎unison-src/transcripts-using-base/fix3542.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ arrayList v n = do
1919
I found and typechecked these definitions in scratch.u. If you
2020
do an `update`, here's how your codebase would change:
2121
22-
⍟ These new definitions are ok to `update`:
22+
⍟ New definitions:
2323
2424
arrayList : Nat -> Nat -> '{Exception, Scope s} [Nat]
2525

‎unison-src/transcripts-using-base/fix3939.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ meh = 9
1111
I found and typechecked these definitions in scratch.u. If you
1212
do an `update`, here's how your codebase would change:
1313
14-
⍟ These new definitions are ok to `update`:
14+
⍟ New definitions:
1515
1616
meh : Nat
1717
meh.doc : Doc2

‎unison-src/transcripts-using-base/fix4746.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ run s =
4141
I found and typechecked these definitions in scratch.u. If you
4242
do an `update`, here's how your codebase would change:
4343
44-
⍟ These new definitions are ok to `update`:
44+
⍟ New definitions:
4545
4646
ability Issue t
4747
run : '{Issue t} () -> '{Stream Text} ()

‎unison-src/transcripts-using-base/fix5178.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ foo = {{
1010
I found and typechecked these definitions in scratch.u. If you
1111
do an `update`, here's how your codebase would change:
1212
13-
⍟ These new definitions are ok to `update`:
13+
⍟ New definitions:
1414
1515
foo : Doc2
1616
```

‎unison-src/transcripts-using-base/hashing.output.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex
8080
I found and typechecked these definitions in scratch.u. If you
8181
do an `update`, here's how your codebase would change:
8282
83-
⍟ These new definitions are ok to `update`:
83+
⍟ New definitions:
8484
8585
ex1 : Text
8686
ex2 : Text
@@ -384,7 +384,7 @@ test> hmac_sha2_512.tests.ex2 =
384384
I found and typechecked these definitions in scratch.u. If you
385385
do an `update`, here's how your codebase would change:
386386
387-
⍟ These new definitions are ok to `update`:
387+
⍟ New definitions:
388388
389389
ex' : HashAlgorithm
390390
-> Text
@@ -447,7 +447,7 @@ test> md5.tests.ex3 =
447447
448448
⊡ Previously added definitions will be ignored: ex
449449
450-
⍟ These new definitions are ok to `update`:
450+
⍟ New definitions:
451451
452452
md5.tests.ex1 : [Result]
453453
md5.tests.ex2 : [Result]

‎unison-src/transcripts-using-base/mvar.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ testMvars _ =
5656
I found and typechecked these definitions in scratch.u. If you
5757
do an `update`, here's how your codebase would change:
5858
59-
⍟ These new definitions are ok to `update`:
59+
⍟ New definitions:
6060
6161
eitherCk : (a ->{g} Boolean) -> Either e a ->{g} Boolean
6262
testMvars : '{IO} [Result]

‎unison-src/transcripts-using-base/nat-coersion.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test = 'let
3838
I found and typechecked these definitions in scratch.u. If you
3939
do an `update`, here's how your codebase would change:
4040
41-
⍟ These new definitions are ok to `update`:
41+
⍟ New definitions:
4242
4343
test : '{IO} [Result]
4444
testNat : Nat

‎unison-src/transcripts-using-base/net.output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ testDefaultPort _ =
102102
I found and typechecked these definitions in scratch.u. If you
103103
do an `update`, here's how your codebase would change:
104104
105-
⍟ These new definitions are ok to `update`:
105+
⍟ New definitions:
106106
107107
testDefaultHost : '{IO} [Result]
108108
testDefaultPort : '{IO} [Result]
@@ -187,7 +187,7 @@ testTcpConnect = 'let
187187
I found and typechecked these definitions in scratch.u. If you
188188
do an `update`, here's how your codebase would change:
189189
190-
⍟ These new definitions are ok to `update`:
190+
⍟ New definitions:
191191
192192
clientThread : MVar Nat -> MVar Text -> '{IO} ()
193193
serverThread : MVar Nat -> Text -> '{IO} ()

‎unison-src/transcripts-using-base/random-deserial.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ serialTests = do
6161
I found and typechecked these definitions in scratch.u. If you
6262
do an `update`, here's how your codebase would change:
6363
64-
⍟ These new definitions are ok to `update`:
64+
⍟ New definitions:
6565
6666
availableCases : '{IO, Exception} [Text]
6767
directory : Text

‎unison-src/transcripts-using-base/ref-promise.output.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ casTest = do
3232
I found and typechecked these definitions in scratch.u. If you
3333
do an `update`, here's how your codebase would change:
3434
35-
⍟ These new definitions are ok to `update`:
35+
⍟ New definitions:
3636
3737
casTest : '{IO} [Result]
3838
```
@@ -95,7 +95,7 @@ promiseConcurrentTest = do
9595
I found and typechecked these definitions in scratch.u. If you
9696
do an `update`, here's how your codebase would change:
9797
98-
⍟ These new definitions are ok to `update`:
98+
⍟ New definitions:
9999
100100
promiseConcurrentTest : '{IO} [Result]
101101
promiseSequentialTest : '{IO} [Result]
@@ -147,7 +147,7 @@ atomicUpdate ref f =
147147
I found and typechecked these definitions in scratch.u. If you
148148
do an `update`, here's how your codebase would change:
149149
150-
⍟ These new definitions are ok to `update`:
150+
⍟ New definitions:
151151
152152
atomicUpdate : Ref {IO} a -> (a -> a) ->{IO} ()
153153
```
@@ -185,7 +185,7 @@ spawnN n fa =
185185
I found and typechecked these definitions in scratch.u. If you
186186
do an `update`, here's how your codebase would change:
187187
188-
⍟ These new definitions are ok to `update`:
188+
⍟ New definitions:
189189
190190
spawnN : Nat -> '{IO} a ->{IO} [a]
191191
```
@@ -233,7 +233,7 @@ fullTest = do
233233
I found and typechecked these definitions in scratch.u. If you
234234
do an `update`, here's how your codebase would change:
235235
236-
⍟ These new definitions are ok to `update`:
236+
⍟ New definitions:
237237
238238
fullTest : '{IO} [Result]
239239
```

‎unison-src/transcripts-using-base/replacements.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mapTests = do [!testIt]
2424
I found and typechecked these definitions in scratch.u. If you
2525
do an `update`, here's how your codebase would change:
2626
27-
⍟ These new definitions are ok to `update`:
27+
⍟ New definitions:
2828
2929
mapTests : '{IO} [Result]
3030
testIt : '{IO} Result

‎unison-src/transcripts-using-base/serial-test-00.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ mkTestCase = do
7373
I found and typechecked these definitions in scratch.u. If you
7474
do an `update`, here's how your codebase would change:
7575
76-
⍟ These new definitions are ok to `update`:
76+
⍟ New definitions:
7777
7878
structural type Tree a
7979
evaluate : (Tree Nat -> Nat)

‎unison-src/transcripts-using-base/serial-test-01.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mkTestCase = do
2121
I found and typechecked these definitions in scratch.u. If you
2222
do an `update`, here's how your codebase would change:
2323
24-
⍟ These new definitions are ok to `update`:
24+
⍟ New definitions:
2525
2626
combines : ([Float], [Int], [Char]) -> Text
2727
l1 : [Float]

‎unison-src/transcripts-using-base/serial-test-02.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ mkTestCase = do
3535
I found and typechecked these definitions in scratch.u. If you
3636
do an `update`, here's how your codebase would change:
3737
38-
⍟ These new definitions are ok to `update`:
38+
⍟ New definitions:
3939
4040
structural ability Exit a
4141
l1 : [Nat]

‎unison-src/transcripts-using-base/serial-test-03.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mkTestCase = do
4949
I found and typechecked these definitions in scratch.u. If you
5050
do an `update`, here's how your codebase would change:
5151
52-
⍟ These new definitions are ok to `update`:
52+
⍟ New definitions:
5353
5454
structural ability DC r
5555
structural type Delayed r

‎unison-src/transcripts-using-base/serial-test-04.output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mkTestCase = do
1919
I found and typechecked these definitions in scratch.u. If you
2020
do an `update`, here's how your codebase would change:
2121
22-
⍟ These new definitions are ok to `update`:
22+
⍟ New definitions:
2323
2424
mkTestCase : '{IO, Exception} ()
2525
mutual0 : Nat -> Text

0 commit comments

Comments
 (0)