Merge pull request #3643 from urbit/jb/octs-once

zuse: remove duplicate $octs definition
This commit is contained in:
Joe Bryan 2020-10-06 10:51:44 -07:00 committed by GitHub
commit c8ae2c2537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 12 additions and 18 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e4edc51f2f314a5236deb4a975d6364cca2164f104b6656446d52ba61ac3e45
size 19166792
oid sha256:6eaa8eba3b5170da4162feadcdc7804fa72db9b3746927d4a895fa192b0a6483
size 6316916

View File

@ -9,7 +9,7 @@
|_ ato/@
++ grab |%
++ noun @
++ mime |=({* p/octs:eyre} q.p)
++ mime |=([* p=octs] q.p)
--
++ grow |%
++ mime [/application/x-urb-unknown (as-octs ato)]

View File

@ -16,7 +16,7 @@
++ grab
|%
++ mime
|= [p=mite:eyre q=octs:eyre]
|= (pair mite octs)
=/ wan=wain (to-wain q.q)
?> ?=(^ wan)
%+ murn t.wan

View File

@ -9,7 +9,7 @@
::
++ grab :: convert from
|%
++ mime |=({p/mite:eyre q/octs:eyre} (to-wain q.q))
++ mime |=((pair mite octs) (to-wain q.q))
++ noun wain :: clam from %noun
--
++ grow

View File

@ -6,7 +6,7 @@
::
++ grab :: convert from
|%
++ mime |=([p=mite:eyre q=octs:eyre] (to-wain q.q))
++ mime |=((pair mite octs) (to-wain q.q))
++ noun wain :: clam from %noun
--
++ grow

View File

@ -13,7 +13,7 @@
|%
++ noun pill
++ mime
|= [p=mite:eyre q=octs:eyre]
|= (pair mite octs)
=+ o=(pair ,* ,*) :: ,*)
=+ (,[boot-ova=* kernel-ova=(list o) userspace-ova=(list o)] (cue q.q))
=/ convert

View File

@ -25,7 +25,7 @@
++ grab
|%
++ mime
|= [mite:eyre p=octs:eyre]
|= [mite p=octs]
|^ (rash q.p both-parser)
++ key-val
|* [key=rule val=rule]

View File

@ -23,7 +23,7 @@
++ grab
|%
++ mime
|= [mite:eyre p=octs:eyre]
|= [mite p=octs]
|^ (rash q.p both-parser)
++ key-val
|* [key=rule val=rule]

View File

@ -11,7 +11,7 @@
::
++ grab :: convert from
|%
++ mime |=({p/mite:eyre q/octs:eyre} (to-wain q.q))
++ mime |=((pair mite octs) (to-wain q.q))
++ noun wain :: clam from %noun
--
++ grow

View File

@ -23,7 +23,7 @@
--
++ grab
|%
++ mime |=({p/mite:eyre q/octs:eyre} q.q)
++ mime |=((pair mite octs) q.q)
++ noun @t
++ txt of-wain:format
--

View File

@ -23,7 +23,7 @@
--
++ grab
|%
++ mime |=({p/mite:eyre q/octs:eyre} q.q)
++ mime |=((pair mite octs) q.q)
++ noun @t
++ txt of-wain:format
--

View File

@ -75,10 +75,6 @@
++ life @ud :: ship key revision
++ rift @ud :: ship continuity
++ mime {p/mite q/octs} :: mimetyped data
::
::
:: TODO: Rename to +mime once the current +mime and +mite are gone. The
::
++ octs {p/@ud q/@} :: octet-stream
++ sock {p/ship q/ship} :: outgoing [our his]
::+|
@ -1559,9 +1555,7 @@
$put :: PUT
$trac :: TRACE
== ::
++ mite (list @ta) :: mime type
++ moth {p/meth q/math r/(unit octs)} :: http operation
++ octs {p/@ud q/@t} :: octet-stream
++ oryx @t :: CSRF secret
++ pork {p/(unit @ta) q/(list @t)} :: fully parsed url
:: +prox: proxy notification