about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShiney <shine.leo@gmail.com>2015-12-15 22:13:04 +0000
committerShiney <shine.leo@gmail.com>2015-12-16 20:54:02 +0000
commit62fa40f87a25b3a8bd79eb614ed92ccff7e6f819 (patch)
treed25a9d632c5a5932853b0fe75994cc5efafca4de
parent9e63cecb10a3a22abed9c230c5daf268dc258bf3 (diff)
Used bold and italic in the markdown to make the stack and heap documentation clearer
-rw-r--r--src/doc/book/the-stack-and-the-heap.md42
1 files changed, 22 insertions, 20 deletions
diff --git a/src/doc/book/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md
index 9cc3e12aa04..63b73a7fc31 100644
--- a/src/doc/book/the-stack-and-the-heap.md
+++ b/src/doc/book/the-stack-and-the-heap.md
@@ -130,63 +130,64 @@ on the stack is the first one you retrieve from it.
 Let’s try a three-deep example:
 
 ```rust
-fn bar() {
+fn italic() {
     let i = 6;
 }
 
-fn foo() {
+fn bold() {
     let a = 5;
     let b = 100;
     let c = 1;
 
-    bar();
+    italic();
 }
 
 fn main() {
     let x = 42;
 
-    foo();
+    bold();
 }
 ```
 
+We have some kooky function names to make the diagrams clearer.
+
 Okay, first, we call `main()`:
 
 | Address | Name | Value |
 |---------|------|-------|
 | 0       | x    | 42    |
 
-Next up, `main()` calls `foo()`:
+Next up, `main()` calls `bold()`:
 
 | Address | Name | Value |
 |---------|------|-------|
-| 3       | c    | 1     |
-| 2       | b    | 100   |
-| 1       | a    | 5     |
+| **3**   | **c**|**1**  |
+| **2**   | **b**|**100**|
+| **1**   | **a**| **5** |
 | 0       | x    | 42    |
 
-And then `foo()` calls `bar()`:
+And then `bold()` calls `italic()`:
 
 | Address | Name | Value |
 |---------|------|-------|
-| 4       | i    | 6     |
-| 3       | c    | 1     |
-| 2       | b    | 100   |
-| 1       | a    | 5     |
+| *4*     | *i*  | *6*   |
+| **3**   | **c**|**1**  |
+| **2**   | **b**|**100**|
+| **1**   | **a**| **5** |
 | 0       | x    | 42    |
-
 Whew! Our stack is growing tall.
 
-After `bar()` is over, its frame is deallocated, leaving just `foo()` and
+After `italic()` is over, its frame is deallocated, leaving just `bold()` and
 `main()`:
 
 | Address | Name | Value |
 |---------|------|-------|
-| 3       | c    | 1     |
-| 2       | b    | 100   |
-| 1       | a    | 5     |
-| 0       | x    | 42    |
+| **3**   | **c**|**1**  |
+| **2**   | **b**|**100**|
+| **1**   | **a**| **5** |
+| 0       | x    | 42    | 
 
-And then `foo()` ends, leaving just `main()`:
+And then `bold()` ends, leaving just `main()`:
 
 | Address | Name | Value |
 |---------|------|-------|
@@ -578,3 +579,4 @@ 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).
+