Skip to content

Commit

Permalink
Merge pull request #1471 from unisonweb/master
Browse files Browse the repository at this point in the history
M1l release notes
  • Loading branch information
aryairani authored Apr 27, 2020
2 parents 5edab66 + e0bd587 commit 7448713
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
path = yaks/haskeline
url = https://github.com/aryairani/haskeline.git
branch = topic/align-ansi-completions
[submodule "yaks/configurator"]
path = yaks/configurator
url = https://github.com/unisonweb/configurator.git
branch = master
ignore = untracked
4 changes: 2 additions & 2 deletions parser-typechecker/src/Unison/Builtin.hs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ builtinsSrc =
, B "Int.and" $ int --> int --> int
, B "Int.or" $ int --> int --> int
, B "Int.xor" $ int --> int --> int
, B "Int.complement" $ int --> int --> int
, B "Int.complement" $ int --> int
, B "Int.increment" $ int --> int
, B "Int.isEven" $ int --> boolean
, B "Int.isOdd" $ int --> boolean
Expand Down Expand Up @@ -267,7 +267,7 @@ builtinsSrc =
, B "Nat.and" $ nat --> nat --> nat
, B "Nat.or" $ nat --> nat --> nat
, B "Nat.xor" $ nat --> nat --> nat
, B "Nat.complement" $ nat --> nat --> nat
, B "Nat.complement" $ nat --> nat
, B "Nat.drop" $ nat --> nat --> nat
, B "Nat.fromText" $ text --> optional nat
, B "Nat.increment" $ nat --> nat
Expand Down
1 change: 1 addition & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ allow-different-user: true
packages:
- yaks/easytest
- yaks/haskeline
- yaks/configurator
- parser-typechecker
- unison-core

Expand Down
4 changes: 2 additions & 2 deletions unison-src/transcripts/alias-many.output.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Let's try it!
64. Int.- : Int -> Int -> Int
65. Int./ : Int -> Int -> Int
66. Int.and : Int -> Int -> Int
67. Int.complement : Int -> Int -> Int
67. Int.complement : Int -> Int
68. Int.eq : Int -> Int -> Boolean
69. Int.fromText : Text -> Optional Int
70. Int.gt : Int -> Int -> Boolean
Expand Down Expand Up @@ -128,7 +128,7 @@ Let's try it!
108. Nat.+ : Nat -> Nat -> Nat
109. Nat./ : Nat -> Nat -> Nat
110. Nat.and : Nat -> Nat -> Nat
111. Nat.complement : Nat -> Nat -> Nat
111. Nat.complement : Nat -> Nat
112. Nat.drop : Nat -> Nat -> Nat
113. Nat.eq : Nat -> Nat -> Boolean
114. Nat.fromText : Text -> Optional Nat
Expand Down
1 change: 1 addition & 0 deletions yaks/configurator
Submodule configurator added at 31daaf

0 comments on commit 7448713

Please sign in to comment.