Skip to content

Commit

Permalink
Auto merge of rust-lang#25601 - ericye16:master, r=steveklabnik
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed May 21, 2015
2 parents 59ba55d + 4bc8853 commit 7044f4a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/doc/trpl/the-stack-and-the-heap.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ allocated on the heap:
| 0 | x | ?????? |

[drop]: drop.html
[moving]: We can make the memory live longer by transferring ownership,
sometimes called ‘moving out of the box’. More complex examples will
be covered later.
[^moving]: We can make the memory live longer by transferring ownership,
sometimes called ‘moving out of the box’. More complex examples will
be covered later.


And then the stack frame goes away, freeing all of our memory.
Expand Down

0 comments on commit 7044f4a

Please sign in to comment.