about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-05-13 16:51:30 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-05-13 16:51:30 -0400
commita93c8b655f0d48a197ca5355825ed4fe3cc8ffbd (patch)
tree137e20698eb997c7319b2e58a01731a00e20d253 /src
parent63f39a621bff429c9968f736066457626eb74f41 (diff)
parent22eb466dfd38bb9c8063bd37054baf2e47092b97 (diff)
downloadrust-a93c8b655f0d48a197ca5355825ed4fe3cc8ffbd.tar.gz
rust-a93c8b655f0d48a197ca5355825ed4fe3cc8ffbd.zip
Rollup merge of #25382 - steveklabnik:typo_fix, r=alexcrichton
Thanks apdapreturns
Diffstat (limited to 'src')
-rw-r--r--src/doc/trpl/the-stack-and-the-heap.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/trpl/the-stack-and-the-heap.md
index 7b1cd7dc809..f5654d62939 100644
--- a/src/doc/trpl/the-stack-and-the-heap.md
+++ b/src/doc/trpl/the-stack-and-the-heap.md
@@ -266,7 +266,7 @@ Rust programs use [jemalloc][jemalloc] for this purpose.
 Anyway, back to our example. Since this memory is on the heap, it can stay
 alive longer than the function which allocates the box. In this case, however,
 it doesn’t.[^moving] When the function is over, we need to free the stack frame
-for `main()`. `Box<T>`, though, has a trick up its sleve: [Drop][drop]. The
+for `main()`. `Box<T>`, though, has a trick up its sleeve: [Drop][drop]. The
 implementation of `Drop` for `Box` deallocates the memory that was allocated
 when it was created. Great! So when `x` goes away, it first frees the memory
 allocated on the heap: