Skip to content

Commit 512bba2

Browse files
catamorphismgraydon
authored andcommitted
Change 'statement' to 'expression' in a bunch of places
1 parent 70e5457 commit 512bba2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

doc/rust.texi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ The Rust type system is primarily structural, and contains the standard
334334
assortment of useful ``algebraic'' type constructors from functional
335335
languages, such as function types, tuples, record types, vectors, and
336336
nominally-tagged disjoint unions. Such values may be @emph{pattern-matched} in
337-
an @code{alt} statement.
337+
an @code{alt} expression.
338338

339339
@sp 1
340340
@item Generic code
@@ -394,8 +394,8 @@ the surrounding text by skipping over the bracketed ``extension text''.
394394
@sp 1
395395
@item Idempotent failure
396396

397-
If a task fails due to a signal, or if it executes the special @code{fail}
398-
statement, it enters the @emph{failing} state. A failing task unwinds its
397+
If a task fails due to a signal, or if it evaluates the special @code{fail}
398+
expression, it enters the @emph{failing} state. A failing task unwinds its
399399
control stack, frees all of its owned resources (executing destructors) and
400400
enters the @emph{dead} state. Failure is idempotent and non-recoverable.
401401

@@ -1486,8 +1486,8 @@ operating-system processes.
14861486
@cindex Port
14871487
@cindex Channel
14881488
@cindex Message passing
1489-
@cindex Send statement
1490-
@cindex Receive statement
1489+
@cindex Send expression
1490+
@cindex Receive expression
14911491

14921492
With the exception of @emph{unsafe} constructs, Rust tasks are isolated from
14931493
interfering with one another's memory directly. Instead of manipulating shared
@@ -1563,14 +1563,14 @@ A task begins its lifecycle -- once it has been spawned -- in the
15631563
function, and any functions called by the entry function.
15641564

15651565
A task may transition from the @emph{running} state to the @emph{blocked}
1566-
state any time it executes a communication statement on a port or channel that
1567-
cannot be immediately completed. When the communication statement can be
1566+
state any time it evaluates a communication expression on a port or channel that
1567+
cannot be immediately completed. When the communication expression can be
15681568
completed -- when a message arrives at a sender, or a queue drains
15691569
sufficiently to complete a semi-synchronous send -- then the blocked task will
15701570
unblock and transition back to @emph{running}.
15711571

15721572
A task may transition to the @emph{failing} state at any time, due to an
1573-
un-trapped signal or the execution of a @code{fail} statement. Once
1573+
un-trapped signal or the evaluation of a @code{fail} expression. Once
15741574
@emph{failing}, a task unwinds its stack and transitions to the @emph{dead}
15751575
state. Unwinding the stack of a task is done by the task itself, on its own
15761576
control stack. If a value with a destructor is freed during unwinding, the

0 commit comments

Comments
 (0)