aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-07-13 16:04:31 -0700
committerGraydon Hoare <[email protected]>2010-07-13 16:04:31 -0700
commit405cd282a305270df781bd77d6a476b9398e7e1c (patch)
treed9daae8a80c5f29d3ec9d4d5936c3c24e0655645
parentFix the next typo in mlist-cycle.rs; still doesn't work. (diff)
downloadrust-405cd282a305270df781bd77d6a476b9398e7e1c.tar.xz
rust-405cd282a305270df781bd77d6a476b9398e7e1c.zip
Typo fixes to docs, from Ralph Giles.
-rw-r--r--doc/rust.texi17
-rw-r--r--src/boot/README2
2 files changed, 10 insertions, 9 deletions
diff --git a/doc/rust.texi b/doc/rust.texi
index 9dc6ea59..0b6f0cae 100644
--- a/doc/rust.texi
+++ b/doc/rust.texi
@@ -1201,9 +1201,9 @@ different tasks. Like any other immutable type, they can pass over channels,
and live as long as the last task referencing them within a given domain. When
unreferenced, they are destroyed immediately (due to reference-counting) and
returned to the heap memory allocator. Destruction of an immutable box also
-executes within the context of task that drops the last reference to a shared
-heap allocation, so executing a long-running destructor does not interrupt
-execution of other tasks.
+executes within the context of the task that drops the last reference to a
+shared heap allocation, so executing a long-running destructor does not
+interrupt execution of other tasks.
@node Ref.Mem.Own
@@ -2997,7 +2997,7 @@ by the runtime or emitted to a system console. Log statements are enabled or
disabled dynamically at run-time on a per-task and per-item
basis. @xref{Ref.Run.Log}.
-Executing a @code{log} statement not considered an @code{io} effect in the
+Executing a @code{log} statement is not considered an @code{io} effect in the
effect system. In other words, a pure function remains pure even if it
contains a log statement.
@@ -3046,10 +3046,11 @@ completes normally, the runtime will not log the path.
A value that is marked by a @code{note} statement is @emph{not} copied aside
when control passes through the @code{note}. In other words, if a @code{note}
-statement notes a particular @var{lval}, and code after the @code{note} that
-slot, and then a subsequent failure occurs, the @emph{mutated} value will be
-logged during unwinding, @emph{not} the original value that was denoted by the
-@var{lval} at the moment control passed through the @code{note} statement.
+statement notes a particular @var{lval}, and code after the @code{note}
+mutates that slot, and then a subsequent failure occurs, the @emph{mutated}
+value will be logged during unwinding, @emph{not} the original value that was
+denoted by the @var{lval} at the moment control passed through the @code{note}
+statement.
@node Ref.Stmt.While
@subsection Ref.Stmt.While
diff --git a/src/boot/README b/src/boot/README
index 30c1f0e9..891e1336 100644
--- a/src/boot/README
+++ b/src/boot/README
@@ -398,7 +398,7 @@ Probably-bad ideas we will want to do differently in the self-hosted compiler:
ever-more constraints (is_resolved(ast), is_typechecked(ast), etc.)
- Trans should be organized as pure and value-producing code, not imperatively
- emitting quads into emitters. LLVM will enforce this anwyays. See what
+ emitting quads into emitters. LLVM will enforce this anyways. See what
happened in lltrans.ml if you're curious what it'll look (more) like.
- The PIC scheme will have to change, hopefully get much easier.