Skip to content

Commit ab75cc8

Browse files
committed
don't need builtins.mergeio when using base
1 parent b052524 commit ab75cc8

21 files changed

+29
-91
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11

22
Tests a former error due to bad calling conventions on delay.impl
33

4-
```ucm:hide
5-
.> builtins.mergeio
6-
```
7-
84
```unison
95
timingApp2 : '{IO, Exception} ()
10-
timingApp2 _ =
6+
timingApp2 _ =
117
printLine "Hello"
128
delay 10
139
printLine "World"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Tests a former error due to bad calling conventions on delay.impl
33

44
```unison
55
timingApp2 : '{IO, Exception} ()
6-
timingApp2 _ =
6+
timingApp2 _ =
77
printLine "Hello"
88
delay 10
99
printLine "World"

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
```ucm:hide
2-
.> builtins.mergeio
3-
```
4-
51
This file tests some obscure issues involved with abilities and over-applied
62
functions.
73

@@ -15,7 +11,7 @@ Stream.map : (a -> b) -> '{Stream a} r -> '{Stream b} r
1511
Stream.map f stream = handle !stream with Stream.map.handler f
1612
1713
Stream.map.handler : (a -> b) -> Request {Stream a} r -> '{Stream b} r
18-
Stream.map.handler f = cases
14+
Stream.map.handler f = cases
1915
{Stream.emit a -> resume} -> 'let
2016
Stream.emit (f a)
2117
Stream.map f resume ()
@@ -27,12 +23,12 @@ increment n = 1 + n
2723
> Stream.toList (Stream.map increment (Stream.fromList [1,2,3]))
2824
2925
> let
30-
s1 = do emit 10
26+
s1 = do emit 10
3127
emit 20
3228
emit 30
3329
emit 40
3430
s2 = Stream.map (a -> a * 10) s1
35-
Stream.toList s2
31+
Stream.toList s2
3632
```
3733

3834
```unison

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Stream.map : (a -> b) -> '{Stream a} r -> '{Stream b} r
1111
Stream.map f stream = handle !stream with Stream.map.handler f
1212
1313
Stream.map.handler : (a -> b) -> Request {Stream a} r -> '{Stream b} r
14-
Stream.map.handler f = cases
14+
Stream.map.handler f = cases
1515
{Stream.emit a -> resume} -> 'let
1616
Stream.emit (f a)
1717
Stream.map f resume ()
@@ -23,12 +23,12 @@ increment n = 1 + n
2323
> Stream.toList (Stream.map increment (Stream.fromList [1,2,3]))
2424
2525
> let
26-
s1 = do emit 10
26+
s1 = do emit 10
2727
emit 20
2828
emit 30
2929
emit 40
3030
s2 = Stream.map (a -> a * 10) s1
31-
Stream.toList s2
31+
Stream.toList s2
3232
```
3333

3434
```ucm
@@ -57,7 +57,7 @@ increment n = 1 + n
5757
5858
[2, 3, 4]
5959
60-
22 | s1 = do emit 10
60+
22 | s1 = do emit 10
6161
6262
[100, 200, 300, 400]
6363

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
2-
```ucm:hide
3-
.> builtins.mergeio
4-
```
5-
61
```unison
72
arrayList v n = do
83
use ImmutableByteArray read8

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
```unison
32
arrayList v n = do
43
use ImmutableByteArray read8

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
```ucm:hide
2-
.> builtins.merge
3-
```
4-
51
Test case for a variable capture problem during let floating. The
62
encloser wasn't accounting for variables bound by matches.
73

@@ -17,20 +13,20 @@ x _ = ()
1713
works x = x + 1
1814
1915
run : '{Issue t} () -> '{Stream Text} ()
20-
run s =
16+
run s =
2117
go = cases
22-
{ one x -> resume } ->
18+
{ one x -> resume } ->
2319
emit "one"
2420
handle resume !x with go
25-
{ two x -> resume } ->
21+
{ two x -> resume } ->
2622
emit "two"
2723
handle resume !x with go
28-
{ three x -> resume } ->
24+
{ three x -> resume } ->
2925
emit "three"
3026
handle resume !x with go
3127
{ _ } -> emit "done"
3228
do handle !s with go
33-
29+
3430
> Stream.toList <| run do
3531
Issue.one do
3632
Issue.two do

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ x _ = ()
1313
works x = x + 1
1414
1515
run : '{Issue t} () -> '{Stream Text} ()
16-
run s =
16+
run s =
1717
go = cases
18-
{ one x -> resume } ->
18+
{ one x -> resume } ->
1919
emit "one"
2020
handle resume !x with go
21-
{ two x -> resume } ->
21+
{ two x -> resume } ->
2222
emit "two"
2323
handle resume !x with go
24-
{ three x -> resume } ->
24+
{ three x -> resume } ->
2525
emit "three"
2626
handle resume !x with go
2727
{ _ } -> emit "done"
2828
do handle !s with go
29-
29+
3030
> Stream.toList <| run do
3131
Issue.one do
3232
Issue.two do

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# Hashing and HMAC builtins
22

3-
```ucm:hide
4-
.> builtins.merge
5-
```
6-
73
Unison has cryptographic builtins for hashing and computing [HMACs](https://en.wikipedia.org/wiki/HMAC) (hash-based message authentication codes). This transcript shows their usage and has some test cases.
84

95
```ucm

unison-src/transcripts-using-base/namespace-dependencies.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# namespace.dependencies command
22

3-
```ucm:hide
4-
.external> builtins.merge
5-
```
6-
73
```unison:hide
84
external.mynat = 1
95
mynamespace.dependsOnText = external.mynat Nat.+ 10

0 commit comments

Comments
 (0)