---

yaml
---
r: 128378
b: refs/heads/master
c: 98ec85f
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 67deb2e65e150a1b9b2fcd457da47e3e13b2c4f7
+refs/heads/master: 98ec85f19e42edafc3d82a737f0ccbd1b7f4ff6c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
 refs/heads/try: 73b8f60b60d8a2a7ca5a7d49d59771350b867951

trunk/src/doc/guide.md

@@ -3669,10 +3669,9 @@ manually free this allocation! If we write
 ```
 
 then Rust will automatically free `x` at the end of the block. This isn't
-because Rust has a garbage collector -- it doesn't. Instead, Rust uses static
-analysis to determine the *lifetime* of `x`, and then generates code to free it
-once it's sure the `x` won't be used again. This Rust code will do the same
-thing as the following C code:
+because Rust has a garbage collector -- it doesn't. Instead, when `x` goes out
+of scope, Rust `free`s `x`. This Rust code will do the same thing as the
+following C code:
 
 ```{c,ignore}
 {