Skip to content

Commit b49356b

Browse files
committed
Transcript changes
Just from adding `Set` data type to auto-defined decls.
1 parent 58512a9 commit b49356b

File tree

13 files changed

+307
-299
lines changed

13 files changed

+307
-299
lines changed

unison-src/transcripts-using-base/all-base-hashes.output.md

Lines changed: 226 additions & 220 deletions
Large diffs are not rendered by default.

unison-src/transcripts/idempotent/alias-term.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ project/main> alias.term lib.builtins.bug foo
1212
project/main> ls
1313
1414
1. foo (a -> b)
15-
2. lib/ (645 terms, 93 types)
15+
2. lib/ (646 terms, 94 types)
1616
```
1717

1818
It won't create a conflicted name, though.
@@ -29,7 +29,7 @@ project/main> alias.term lib.builtins.todo foo
2929
project/main> ls
3030
3131
1. foo (a -> b)
32-
2. lib/ (645 terms, 93 types)
32+
2. lib/ (646 terms, 94 types)
3333
```
3434

3535
You can use `debug.alias.term.force` for that.
@@ -43,5 +43,5 @@ project/main> ls
4343
4444
1. foo (a -> b)
4545
2. foo (a -> b)
46-
3. lib/ (645 terms, 93 types)
46+
3. lib/ (646 terms, 94 types)
4747
```

unison-src/transcripts/idempotent/alias-type.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ project/main> alias.type lib.builtins.Nat Foo
1212
project/main> ls
1313
1414
1. Foo (builtin type)
15-
2. lib/ (645 terms, 93 types)
15+
2. lib/ (646 terms, 94 types)
1616
```
1717

1818
It won't create a conflicted name, though.
@@ -29,7 +29,7 @@ project/main> alias.type lib.builtins.Int Foo
2929
project/main> ls
3030
3131
1. Foo (builtin type)
32-
2. lib/ (645 terms, 93 types)
32+
2. lib/ (646 terms, 94 types)
3333
```
3434

3535
You can use `debug.alias.type.force` for that.
@@ -43,5 +43,5 @@ project/main> ls
4343
4444
1. Foo (builtin type)
4545
2. Foo (builtin type)
46-
3. lib/ (645 terms, 93 types)
46+
3. lib/ (646 terms, 94 types)
4747
```

unison-src/transcripts/idempotent/builtins-merge.md

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,25 @@ scratch/main> ls builtins
7070
61. Scope/ (6 terms)
7171
62. SeqView (type)
7272
63. SeqView/ (2 terms)
73-
64. Socket/ (1 term)
74-
65. Test/ (2 terms, 1 type)
75-
66. Text (builtin type)
76-
67. Text/ (34 terms)
77-
68. ThreadId/ (1 term)
78-
69. Tuple (type)
79-
70. Tuple/ (1 term)
80-
71. UDPSocket (builtin type)
81-
72. Unit (type)
82-
73. Unit/ (1 term)
83-
74. Universal/ (7 terms)
84-
75. Value (builtin type)
85-
76. Value/ (5 terms)
86-
77. bug (a -> b)
87-
78. crypto/ (17 terms, 2 types)
88-
79. io2/ (146 terms, 32 types)
89-
80. metadata/ (2 terms)
90-
81. todo (a -> b)
91-
82. unsafe/ (1 term)
73+
64. Set (type)
74+
65. Set/ (1 term)
75+
66. Socket/ (1 term)
76+
67. Test/ (2 terms, 1 type)
77+
68. Text (builtin type)
78+
69. Text/ (34 terms)
79+
70. ThreadId/ (1 term)
80+
71. Tuple (type)
81+
72. Tuple/ (1 term)
82+
73. UDPSocket (builtin type)
83+
74. Unit (type)
84+
75. Unit/ (1 term)
85+
76. Universal/ (7 terms)
86+
77. Value (builtin type)
87+
78. Value/ (5 terms)
88+
79. bug (a -> b)
89+
80. crypto/ (17 terms, 2 types)
90+
81. io2/ (146 terms, 32 types)
91+
82. metadata/ (2 terms)
92+
83. todo (a -> b)
93+
84. unsafe/ (1 term)
9294
```

unison-src/transcripts/idempotent/emptyCodebase.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ scratch/main> builtins.merge lib.builtins
2121
2222
scratch/main> ls lib
2323
24-
1. builtins/ (471 terms, 75 types)
24+
1. builtins/ (472 terms, 76 types)
2525
```
2626

2727
And for a limited time, you can get even more builtin goodies:
@@ -33,8 +33,8 @@ scratch/main> builtins.mergeio lib.builtinsio
3333
3434
scratch/main> ls lib
3535
36-
1. builtins/ (471 terms, 75 types)
37-
2. builtinsio/ (645 terms, 93 types)
36+
1. builtins/ (472 terms, 76 types)
37+
2. builtinsio/ (646 terms, 94 types)
3838
```
3939

4040
More typically, you'd start out by pulling `base`.

unison-src/transcripts/idempotent/fix1532.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Let's see what we have created...
4242
scratch/main> ls
4343
4444
1. bar/ (1 term)
45-
2. builtin/ (471 terms, 75 types)
45+
2. builtin/ (472 terms, 76 types)
4646
3. foo/ (2 terms)
4747
```
4848

unison-src/transcripts/idempotent/input-parse-errors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ scratch/main> add .
3333
3434
scratch/main> ls
3535
36-
1. lib/ (471 terms, 75 types)
36+
1. lib/ (472 terms, 76 types)
3737
2. x (Nat)
3838
3939
scratch/main> add 1
4040
4141
4242
scratch/main> ls
4343
44-
1. lib/ (471 terms, 75 types)
44+
1. lib/ (472 terms, 76 types)
4545
2. x (Nat)
4646
4747
scratch/main> add 2

unison-src/transcripts/idempotent/move-all.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ scratch/main> ls
8282
1. Bar (Nat)
8383
2. Bar (type)
8484
3. Bar/ (4 terms, 1 type)
85-
4. builtin/ (471 terms, 75 types)
85+
4. builtin/ (472 terms, 76 types)
8686
8787
scratch/main> ls Bar
8888
@@ -144,7 +144,7 @@ z/main> move bonk zonk
144144
145145
z/main> ls
146146
147-
1. builtin/ (471 terms, 75 types)
147+
1. builtin/ (472 terms, 76 types)
148148
2. zonk (Nat)
149149
```
150150

@@ -184,7 +184,7 @@ a/main> move bonk zonk
184184
185185
a/main> ls
186186
187-
1. builtin/ (471 terms, 75 types)
187+
1. builtin/ (472 terms, 76 types)
188188
2. zonk/ (1 term)
189189
190190
a/main> view zonk.zonk

unison-src/transcripts/idempotent/reflog.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ scratch/main> reflog
8484
history.
8585
8686
Branch Hash Description
87-
1. scratch/main #je1v81is75 add
88-
2. scratch/main #jqusdil3qo add
89-
3. scratch/main #vkrum98l0t builtins.merge scratch/main:lib.builtins
87+
1. scratch/main #k0r1bumino add
88+
2. scratch/main #ihqe7hvf43 add
89+
3. scratch/main #6v68unn7ng builtins.merge scratch/main:lib.builtins
9090
4. scratch/main #sg60bvjo91 Project Created
9191
```
9292

@@ -103,11 +103,11 @@ scratch/main> project.reflog
103103
history.
104104
105105
Branch Hash Description
106-
1. scratch/other #kep93f42lt alias.term y scratch/other:z
107-
2. scratch/other #je1v81is75 Branch created from scratch/main
108-
3. scratch/main #je1v81is75 add
109-
4. scratch/main #jqusdil3qo add
110-
5. scratch/main #vkrum98l0t builtins.merge scratch/main:lib.builtins
106+
1. scratch/other #8rnfb370a5 alias.term y scratch/other:z
107+
2. scratch/other #k0r1bumino Branch created from scratch/main
108+
3. scratch/main #k0r1bumino add
109+
4. scratch/main #ihqe7hvf43 add
110+
5. scratch/main #6v68unn7ng builtins.merge scratch/main:lib.builtins
111111
6. scratch/main #sg60bvjo91 Project Created
112112
```
113113

@@ -124,13 +124,13 @@ scratch/main> reflog.global
124124
history.
125125
126126
Branch Hash Description
127-
1. newproject/main #fre30ftp49 alias.term lib.builtins.Nat newproject/main:MyNat
128-
2. newproject/main #vkrum98l0t builtins.merge newproject/main:lib.builtins
127+
1. newproject/main #comilntegs alias.term lib.builtins.Nat newproject/main:MyNat
128+
2. newproject/main #6v68unn7ng builtins.merge newproject/main:lib.builtins
129129
3. newproject/main #sg60bvjo91 Branch Created
130-
4. scratch/other #kep93f42lt alias.term y scratch/other:z
131-
5. scratch/other #je1v81is75 Branch created from scratch/main
132-
6. scratch/main #je1v81is75 add
133-
7. scratch/main #jqusdil3qo add
134-
8. scratch/main #vkrum98l0t builtins.merge scratch/main:lib.builtins
130+
4. scratch/other #8rnfb370a5 alias.term y scratch/other:z
131+
5. scratch/other #k0r1bumino Branch created from scratch/main
132+
6. scratch/main #k0r1bumino add
133+
7. scratch/main #ihqe7hvf43 add
134+
8. scratch/main #6v68unn7ng builtins.merge scratch/main:lib.builtins
135135
9. scratch/main #sg60bvjo91 Project Created
136136
```

unison-src/transcripts/idempotent/reset.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ scratch/main> history
4141
Note: The most recent namespace hash is immediately below this
4242
message.
4343
44-
⊙ 1. #8ldg91ot3m
44+
⊙ 1. #jg5m3tqq0e
4545
4646
+ Adds / updates:
4747
4848
def
4949
50-
⊙ 2. #b3u97j4dvb
50+
⊙ 2. #b6jiups6vt
5151
5252
+ Adds / updates:
5353
5454
def
5555
56-
□ 3. #6rn9nl4phq (start of history)
56+
□ 3. #klo16ufgr2 (start of history)
5757
5858
scratch/main> reset 2
5959
@@ -69,13 +69,13 @@ scratch/main> history
6969
Note: The most recent namespace hash is immediately below this
7070
message.
7171
72-
⊙ 1. #b3u97j4dvb
72+
⊙ 1. #b6jiups6vt
7373
7474
+ Adds / updates:
7575
7676
def
7777
78-
□ 2. #6rn9nl4phq (start of history)
78+
□ 2. #klo16ufgr2 (start of history)
7979
```
8080

8181
Can reset to a value from reflog by number.
@@ -91,10 +91,10 @@ scratch/main> reflog
9191
history.
9292
9393
Branch Hash Description
94-
1. scratch/main #b3u97j4dvb reset b3u97j4dvbqmum80jrjip3mdvj2lfuq3dbj50rq0ftllthgl8apccj...
95-
2. scratch/main #8ldg91ot3m update
96-
3. scratch/main #b3u97j4dvb update
97-
4. scratch/main #6rn9nl4phq builtins.merge
94+
1. scratch/main #b6jiups6vt reset b6jiups6vti8ije4moe5kgjuv25guai9br87gf83llgfd2sa5i6ibo...
95+
2. scratch/main #jg5m3tqq0e update
96+
3. scratch/main #b6jiups6vt update
97+
4. scratch/main #klo16ufgr2 builtins.merge
9898
5. scratch/main #sg60bvjo91 Project Created
9999
100100
-- Reset the current branch to the first history element
@@ -113,19 +113,19 @@ scratch/main> history
113113
Note: The most recent namespace hash is immediately below this
114114
message.
115115
116-
⊙ 1. #8ldg91ot3m
116+
⊙ 1. #jg5m3tqq0e
117117
118118
+ Adds / updates:
119119
120120
def
121121
122-
⊙ 2. #b3u97j4dvb
122+
⊙ 2. #b6jiups6vt
123123
124124
+ Adds / updates:
125125
126126
def
127127
128-
□ 3. #6rn9nl4phq (start of history)
128+
□ 3. #klo16ufgr2 (start of history)
129129
```
130130

131131
# reset branch

0 commit comments

Comments
 (0)