diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2016-08-05 16:12:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 16:12:55 +0200 |
| commit | 6e5e7e2ea065967d73b2b6466ce5da2b24d41a6c (patch) | |
| tree | e5953cf03989d20b5e014d77a767a63cafce7d5b | |
| parent | 8a923d48e27a22918cdddd9ec21227ac211ad815 (diff) | |
| parent | d90c16625f932a4e08a56c1f2f131d8c5ce1214c (diff) | |
| download | rust-6e5e7e2ea065967d73b2b6466ce5da2b24d41a6c.tar.gz rust-6e5e7e2ea065967d73b2b6466ce5da2b24d41a6c.zip | |
Rollup merge of #35189 - mLuby:patch-1, r=steveklabnik
Update the-stack-and-the-heap.md Was surprised to learn that heaps were used in this way, then realized upon reading [the linked paper](http://www.cs.cmu.edu/afs/cs/academic/class/15213-f98/doc/dsa.pdf) that it's a totally different type of heap—an important distinction.
| -rw-r--r-- | src/doc/book/the-stack-and-the-heap.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/doc/book/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md index a1f6a065a25..aee45299cf2 100644 --- a/src/doc/book/the-stack-and-the-heap.md +++ b/src/doc/book/the-stack-and-the-heap.md @@ -26,6 +26,8 @@ The stack is very fast, and is where memory is allocated in Rust by default. But the allocation is local to a function call, and is limited in size. The heap, on the other hand, is slower, and is explicitly allocated by your program. But it’s effectively unlimited in size, and is globally accessible. +Note this meaning of heap, which allocates arbitrary-sized blocks of memory in arbitrary +order, is quite different from the heap data structure. # The Stack |