mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-23 08:18:04 +03:00
Revert "Bump version number of openFile, getBuffering, setBuffering"
This reverts commit 71e8495264
.
This commit is contained in:
parent
71e8495264
commit
160e0076e5
@ -508,15 +508,15 @@ hashBuiltins =
|
||||
|
||||
ioBuiltins :: Var v => [(Text, Type v)]
|
||||
ioBuiltins =
|
||||
[ ("IO.openFile.impl.v4", text --> fmode --> iof handle)
|
||||
[ ("IO.openFile.impl.v3", text --> fmode --> iof handle)
|
||||
, ("IO.closeFile.impl.v3", handle --> iof unit)
|
||||
, ("IO.isFileEOF.impl.v3", handle --> iof boolean)
|
||||
, ("IO.isFileOpen.impl.v3", handle --> iof boolean)
|
||||
, ("IO.isSeekable.impl.v3", handle --> iof boolean)
|
||||
, ("IO.seekHandle.impl.v3", handle --> smode --> int --> iof unit)
|
||||
, ("IO.handlePosition.impl.v3", handle --> iof nat)
|
||||
, ("IO.getBuffering.impl.v4", handle --> iof bmode)
|
||||
, ("IO.setBuffering.impl.v4", handle --> bmode --> iof unit)
|
||||
, ("IO.getBuffering.impl.v3", handle --> iof bmode)
|
||||
, ("IO.setBuffering.impl.v3", handle --> bmode --> iof unit)
|
||||
, ("IO.getBytes.impl.v3", handle --> nat --> iof bytes)
|
||||
, ("IO.putBytes.impl.v3", handle --> bytes --> iof unit)
|
||||
, ("IO.systemTime.impl.v3", unit --> iof nat)
|
||||
|
@ -1376,7 +1376,7 @@ mkForeignTls f = mkForeign $ \a -> fmap flatten (tryIO2 (tryIO1 (f a)))
|
||||
|
||||
declareForeigns :: Var v => FDecl v ()
|
||||
declareForeigns = do
|
||||
declareForeign "IO.openFile.impl.v4" boxIomrToEFBox $
|
||||
declareForeign "IO.openFile.impl.v3" boxIomrToEFBox $
|
||||
mkForeignIOF $ \(fnameText :: Text, n :: Int) ->
|
||||
let fname = (unpack fnameText)
|
||||
mode = case n of
|
||||
@ -1398,10 +1398,10 @@ declareForeigns = do
|
||||
-- TODO: truncating integer
|
||||
. mkForeignIOF $ \h -> fromInteger @Word64 <$> hTell h
|
||||
|
||||
declareForeign "IO.getBuffering.impl.v4" get'buffering
|
||||
declareForeign "IO.getBuffering.impl.v3" get'buffering
|
||||
$ mkForeignIOF hGetBuffering
|
||||
|
||||
declareForeign "IO.setBuffering.impl.v4" set'buffering
|
||||
declareForeign "IO.setBuffering.impl.v3" set'buffering
|
||||
. mkForeignIOF $ uncurry hSetBuffering
|
||||
|
||||
declareForeign "IO.getBytes.impl.v3" boxNatToEFBox . mkForeignIOF $ \(h,n) -> Bytes.fromArray <$> hGet h n
|
||||
|
@ -112,13 +112,13 @@ We can also delete the fork if we're done with it. (Don't worry, it's still in t
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ #de96p6u2cg
|
||||
⊙ #dr7j21cpqp
|
||||
|
||||
- Deletes:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ #dqem8f5d20
|
||||
⊙ #0ct10skh45
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -129,26 +129,26 @@ We can also delete the fork if we're done with it. (Don't worry, it's still in t
|
||||
Original name New name(s)
|
||||
feature1.y master.y
|
||||
|
||||
⊙ #4jdcemtm6m
|
||||
⊙ #8sknads6vj
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ #cnl2m0ael0
|
||||
⊙ #hb8qfqt9ai
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
x master.x
|
||||
|
||||
⊙ #etcalebovi
|
||||
⊙ #73mdo6cqdj
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
x
|
||||
|
||||
⊙ #god5mcr2mq
|
||||
⊙ #q1npn63eti
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
|
@ -59,16 +59,16 @@ y = 2
|
||||
most recent, along with the command that got us there. Try:
|
||||
|
||||
`fork 2 .old`
|
||||
`fork #pmngl7aiu6 .old` to make an old namespace
|
||||
`fork #pknj0m8137 .old` to make an old namespace
|
||||
accessible again,
|
||||
|
||||
`reset-root #pmngl7aiu6` to reset the root namespace and
|
||||
`reset-root #pknj0m8137` to reset the root namespace and
|
||||
its history to that of the
|
||||
specified namespace.
|
||||
|
||||
1. #11l6nsn9m9 : add
|
||||
2. #pmngl7aiu6 : add
|
||||
3. #god5mcr2mq : builtins.merge
|
||||
1. #j376pgmitc : add
|
||||
2. #pknj0m8137 : add
|
||||
3. #q1npn63eti : builtins.merge
|
||||
4. #7asfbtqmoj : (initial reflogged namespace)
|
||||
|
||||
```
|
||||
|
@ -13,7 +13,7 @@ Let's look at some examples. We'll start with a namespace with just the builtins
|
||||
|
||||
|
||||
|
||||
□ #2r3lq7q69e (start of history)
|
||||
□ #klkpbos013 (start of history)
|
||||
|
||||
.> fork builtin builtin2
|
||||
|
||||
@ -42,21 +42,21 @@ Now suppose we `fork` a copy of builtin, then rename `Nat.+` to `frobnicate`, th
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ #fef5stn4vd
|
||||
⊙ #2389gjnigh
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ #7medp5b406
|
||||
⊙ #l7dr0sq1vj
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ #2r3lq7q69e (start of history)
|
||||
□ #klkpbos013 (start of history)
|
||||
|
||||
```
|
||||
If we merge that back into `builtin`, we get that same chain of history:
|
||||
@ -71,21 +71,21 @@ If we merge that back into `builtin`, we get that same chain of history:
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ #fef5stn4vd
|
||||
⊙ #2389gjnigh
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ #7medp5b406
|
||||
⊙ #l7dr0sq1vj
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ #2r3lq7q69e (start of history)
|
||||
□ #klkpbos013 (start of history)
|
||||
|
||||
```
|
||||
Let's try again, but using a `merge.squash` (or just `squash`) instead. The history will be unchanged:
|
||||
@ -106,7 +106,7 @@ Let's try again, but using a `merge.squash` (or just `squash`) instead. The hist
|
||||
|
||||
|
||||
|
||||
□ #2r3lq7q69e (start of history)
|
||||
□ #klkpbos013 (start of history)
|
||||
|
||||
```
|
||||
The churn that happened in `mybuiltin` namespace ended up back in the same spot, so the squash merge of that namespace with our original namespace had no effect.
|
||||
|
Loading…
Reference in New Issue
Block a user