about summary refs log tree commit diff
diff options
context:
space:
mode:
authormLuby <mLuby@users.noreply.github.com>2016-08-02 14:08:19 -0700
committerGitHub <noreply@github.com>2016-08-02 14:08:19 -0700
commitd90c16625f932a4e08a56c1f2f131d8c5ce1214c (patch)
treef40e1161e5e6c02d7003a89386091b75a2a4c969
parent32e462ef99e2f61b75e2b0ef37048d50ad8ccf6c (diff)
downloadrust-d90c16625f932a4e08a56c1f2f131d8c5ce1214c.tar.gz
rust-d90c16625f932a4e08a56c1f2f131d8c5ce1214c.zip
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.md2
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