about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-01-14 14:58:35 -0500
committerSteve Klabnik <steve@steveklabnik.com>2016-01-14 14:58:35 -0500
commit9b10d0e1e523eb47ea4910450ec48b099880ab2b (patch)
treed20f35e78ff17e212abe2030ff81e8e54a30ab80
parent958bff100aad1b3bcef1d780b3b426685bd30608 (diff)
parent049b9e4e8067b998e4581d026b0bc6d1113ab9f5 (diff)
downloadrust-9b10d0e1e523eb47ea4910450ec48b099880ab2b.tar.gz
rust-9b10d0e1e523eb47ea4910450ec48b099880ab2b.zip
Rollup merge of #30911 - tshepang:missing-word, r=Manishearth
Also, whitespace fixes
-rw-r--r--src/doc/book/the-stack-and-the-heap.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doc/book/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md
index 3be4096e971..a7b6faccd8d 100644
--- a/src/doc/book/the-stack-and-the-heap.md
+++ b/src/doc/book/the-stack-and-the-heap.md
@@ -185,7 +185,7 @@ After `italic()` is over, its frame is deallocated, leaving only `bold()` and
 | **3**   | **c**|**1**  |
 | **2**   | **b**|**100**|
 | **1**   | **a**| **5** |
-| 0       | x    | 42    | 
+| 0       | x    | 42    |
 
 And then `bold()` ends, leaving only `main()`:
 
@@ -554,8 +554,8 @@ Managing the memory for the stack is trivial: The machine
 increments or decrements a single value, the so-called “stack pointer”.
 Managing memory for the heap is non-trivial: heap-allocated memory is freed at
 arbitrary points, and each block of heap-allocated memory can be of arbitrary
-size, the memory manager must generally work much harder to identify memory for
-reuse.
+size, so the memory manager must generally work much harder to
+identify memory for reuse.
 
 If you’d like to dive into this topic in greater detail, [this paper][wilson]
 is a great introduction.
@@ -579,4 +579,3 @@ comes at the cost of either significant runtime support (e.g. in the form of a
 garbage collector) or significant programmer effort (in the form of explicit
 memory management calls that require verification not provided by the Rust
 compiler).
-