Skip to content

Commit d81a7ab

Browse files
committed
Minor fixes to the runtime and scheduling part of manual.
1 parent 056fc13 commit d81a7ab

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

doc/rust.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,10 +2886,10 @@ non-executing state (blocked, dead) similarly deschedules the task.
28862886
A call to `core::task::spawn`, passing a 0-argument function as its single
28872887
argument, causes the runtime to construct a new task executing the passed
28882888
function. The passed function is referred to as the _entry function_ for
2889-
the spawned task, and any captured environment is carries is moved from the
2889+
the spawned task, and any captured environment it carries is moved from the
28902890
spawning task to the spawned task before the spawned task begins execution.
28912891

2892-
The result of a `spawn` call is a `core::task::task` value.
2892+
The result of a `spawn` call is a `core::task::Task` value.
28932893

28942894
An example of a `spawn` call:
28952895

@@ -2938,16 +2938,20 @@ An example of a *receive*:
29382938
let s = comm::recv(po);
29392939
~~~~~~~~
29402940

2941+
Note: this communication system will be replaced by a higher-performance system called "pipes",
2942+
in future versions of Rust.
2943+
29412944

29422945
# Runtime services, linkage and debugging
29432946

29442947

2945-
The Rust _runtime_ is a relatively compact collection of C and Rust code
2948+
The Rust _runtime_ is a relatively compact collection of C++ and Rust code
29462949
that provides fundamental services and datatypes to all Rust tasks at
29472950
run-time. It is smaller and simpler than many modern language runtimes. It is
29482951
tightly integrated into the language's execution model of memory, tasks,
29492952
communication and logging.
29502953

2954+
Note: The runtime library will merge with the `core` library in future versions of Rust.
29512955

29522956
### Memory allocation
29532957

0 commit comments

Comments
 (0)