Skip to content

Commit 0a8f5a0

Browse files
committed
---
yaml --- r: 24208 b: refs/heads/master c: ae1a730 h: refs/heads/master v: v3
1 parent 4c5ecd5 commit 0a8f5a0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 1880d783b73387c1baac9e5cb0167d7a0f6e768c
2+
refs/heads/master: ae1a73029ce422ccd52c3c659a32c19ac60d0d4e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ Rust has three competing goals that inform its view of memory:
957957
Most languages that offer strong memory safety guarantees rely upon a
958958
garbage-collected heap to manage all of the objects. This approach is
959959
straightforward both in concept and in implementation, but has
960-
significant costs. Languages that take this approach tend to
960+
significant costs. Languages that follow this path tend to
961961
aggressively pursue ways to ameliorate allocation costs (think the
962962
Java Virtual Machine). Rust supports this strategy with _managed
963963
boxes_: memory allocated on the heap whose lifetime is managed
@@ -982,7 +982,7 @@ tasks. Experience in other languages has proven that isolating each
982982
task's heap from the others is a reliable strategy and one that is
983983
easy for programmers to reason about. Heap isolation has the
984984
additional benefit that garbage collection must only be done
985-
per-heap. Rust never "stops the world" to garbage-collect memory.
985+
per-heap. Rust never "stops the world" to reclaim memory.
986986

987987
Complete isolation of heaps between tasks implies that any data
988988
transferred between tasks must be copied. While this is a fine and

0 commit comments

Comments
 (0)