Skip to content

Commit

Permalink
Merge branch 'master' of github.com:janet-lang/janet
Browse files Browse the repository at this point in the history
  • Loading branch information
bakpakin committed Aug 29, 2021
2 parents 31a7fdc + 26f8ba4 commit b903433
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/boot/boot.janet
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@
~(,ev/thread (fiber/new (fn _thread [&] ,;body) :t)))

(defmacro ev/spawn-thread
``Run some code in a new thread. Like `ev/do-thread`, but returns immediately with a fiber.``
``Run some code in a new thread. Like `ev/do-thread`, but returns nil immediately.``
[& body]
~(,ev/thread (fiber/new (fn _thread [&] ,;body) :t) nil :n))

Expand Down
4 changes: 2 additions & 2 deletions src/core/ev.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ JANET_CORE_FN(cfun_channel_pop,
JANET_CORE_FN(cfun_channel_choice,
"(ev/select & clauses)",
"Block until the first of several channel operations occur. Returns a tuple of the form [:give chan], [:take chan x], or [:close chan], where "
"a :give tuple is the result of a write and :take tuple is the result of a write. Each clause must be either a channel (for "
"a :give tuple is the result of a write and :take tuple is the result of a read. Each clause must be either a channel (for "
"a channel take operation) or a tuple [channel x] for a channel give operation. Operations are tried in order, such that the first "
"clauses will take precedence over later clauses. Both and give and take operations can return a [:close chan] tuple, which indicates that "
"the specified channel was closed while waiting, or that the channel was already closed.") {
Expand Down Expand Up @@ -2438,7 +2438,7 @@ JANET_CORE_FN(cfun_ev_go,
"(ev/go fiber &opt value supervisor)",
"Put a fiber on the event loop to be resumed later. Optionally pass "
"a value to resume with, otherwise resumes with nil. Returns the fiber. "
"An optional `core/channel` can be provided as well as a supervisor. When various "
"An optional `core/channel` can be provided as a supervisor. When various "
"events occur in the newly scheduled fiber, an event will be pushed to the supervisor. "
"If not provided, the new fiber will inherit the current supervisor.") {
janet_arity(argc, 1, 3);
Expand Down

0 comments on commit b903433

Please sign in to comment.