diff options
| author | bors <bors@rust-lang.org> | 2014-08-18 17:26:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-18 17:26:07 +0000 |
| commit | fcbf012ee6c8719090caa6041e0ec1312e1b7659 (patch) | |
| tree | 8156967cccbaba161a5fd048dc339a07e44f64da /src | |
| parent | 7074592ee1ad1a155919268229b6464f2acc576e (diff) | |
| parent | 88e62a96ce9d068382347ee047b0b382dc7c4784 (diff) | |
| download | rust-fcbf012ee6c8719090caa6041e0ec1312e1b7659.tar.gz rust-fcbf012ee6c8719090caa6041e0ec1312e1b7659.zip | |
auto merge of #16576 : steveklabnik/rust/static_analysis_gate, r=pcwalton
This has certain implications that are wrong. Fixes #16299.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/guide.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md index 2593ddc556b..50b64279b50 100644 --- a/src/doc/guide.md +++ b/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} { |
