Skip to content

Commit 405cd28

Browse files
committed
Typo fixes to docs, from Ralph Giles.
1 parent 2eba370 commit 405cd28

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

doc/rust.texi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,9 +1201,9 @@ different tasks. Like any other immutable type, they can pass over channels,
12011201
and live as long as the last task referencing them within a given domain. When
12021202
unreferenced, they are destroyed immediately (due to reference-counting) and
12031203
returned to the heap memory allocator. Destruction of an immutable box also
1204-
executes within the context of task that drops the last reference to a shared
1205-
heap allocation, so executing a long-running destructor does not interrupt
1206-
execution of other tasks.
1204+
executes within the context of the task that drops the last reference to a
1205+
shared heap allocation, so executing a long-running destructor does not
1206+
interrupt execution of other tasks.
12071207

12081208

12091209
@node Ref.Mem.Own
@@ -2997,7 +2997,7 @@ by the runtime or emitted to a system console. Log statements are enabled or
29972997
disabled dynamically at run-time on a per-task and per-item
29982998
basis. @xref{Ref.Run.Log}.
29992999

3000-
Executing a @code{log} statement not considered an @code{io} effect in the
3000+
Executing a @code{log} statement is not considered an @code{io} effect in the
30013001
effect system. In other words, a pure function remains pure even if it
30023002
contains a log statement.
30033003

@@ -3046,10 +3046,11 @@ completes normally, the runtime will not log the path.
30463046

30473047
A value that is marked by a @code{note} statement is @emph{not} copied aside
30483048
when control passes through the @code{note}. In other words, if a @code{note}
3049-
statement notes a particular @var{lval}, and code after the @code{note} that
3050-
slot, and then a subsequent failure occurs, the @emph{mutated} value will be
3051-
logged during unwinding, @emph{not} the original value that was denoted by the
3052-
@var{lval} at the moment control passed through the @code{note} statement.
3049+
statement notes a particular @var{lval}, and code after the @code{note}
3050+
mutates that slot, and then a subsequent failure occurs, the @emph{mutated}
3051+
value will be logged during unwinding, @emph{not} the original value that was
3052+
denoted by the @var{lval} at the moment control passed through the @code{note}
3053+
statement.
30533054

30543055
@node Ref.Stmt.While
30553056
@subsection Ref.Stmt.While

src/boot/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ Probably-bad ideas we will want to do differently in the self-hosted compiler:
398398
ever-more constraints (is_resolved(ast), is_typechecked(ast), etc.)
399399

400400
- Trans should be organized as pure and value-producing code, not imperatively
401-
emitting quads into emitters. LLVM will enforce this anwyays. See what
401+
emitting quads into emitters. LLVM will enforce this anyways. See what
402402
happened in lltrans.ml if you're curious what it'll look (more) like.
403403

404404
- The PIC scheme will have to change, hopefully get much easier.

0 commit comments

Comments
 (0)