diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2015-05-14 20:30:42 -0400 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2015-05-14 20:30:42 -0400 |
| commit | 765a55ed20a130dcc08239d46981c35f3b8ae0a7 (patch) | |
| tree | 69d70ab91bb5e6083057a1004f6ae587878cd19b | |
| parent | c3562110d0160a60297b2b3fc26948672a4cb4e3 (diff) | |
| parent | 785cbe3ac9ae6f79055f87edbbb3128c0db2253b (diff) | |
| download | rust-765a55ed20a130dcc08239d46981c35f3b8ae0a7.tar.gz rust-765a55ed20a130dcc08239d46981c35f3b8ae0a7.zip | |
Rollup merge of #25408 - Nashenas88:rust-book-stack-and-heap-typo, r=steveklabnik
I fixed the typo of the value of e in the memory tables. It is a reference to d, and so it should contain the memory location of d. I also fixed the incorrectly formatted tables so they display properly in html pages.
| -rw-r--r-- | src/doc/trpl/the-stack-and-the-heap.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/trpl/the-stack-and-the-heap.md index 9622a92303f..c47dbd97893 100644 --- a/src/doc/trpl/the-stack-and-the-heap.md +++ b/src/doc/trpl/the-stack-and-the-heap.md @@ -430,7 +430,7 @@ Next, `foo()` calls `bar()` with `x` and `z`: | 2<sup>30</sup> | | 20 | | (2<sup>30</sup>) - 1 | | 5 | | ... | ... | ... | -| 10 | e | 4 | +| 10 | e | 9 | | 9 | d | (2<sup>30</sup>) - 1 | | 8 | c | 5 | | 7 | b | 4 | @@ -455,7 +455,7 @@ At the end of `bar()`, it calls `baz()`: | ... | ... | ... | | 12 | g | 100 | | 11 | f | 4 | -| 10 | e | 4 | +| 10 | e | 9 | | 9 | d | (2<sup>30</sup>) - 1 | | 8 | c | 5 | | 7 | b | 4 | @@ -477,7 +477,7 @@ After `baz()` is over, we get rid of `f` and `g`: | 2<sup>30</sup> | | 20 | | (2<sup>30</sup>) - 1 | | 5 | | ... | ... | ... | -| 10 | e | 4 | +| 10 | e | 9 | | 9 | d | (2<sup>30</sup>) - 1 | | 8 | c | 5 | | 7 | b | 4 | |