---

yaml
---
r: 231822
b: refs/heads/auto
c: 3dd1a48
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c8a661838ed3f4db7a9402df880e539b46f0a0f1
+refs/heads/auto: 3dd1a48f3f7ac0eeffb2aa5d79bc09daf827fc3f
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/index.md

@@ -20,13 +20,30 @@ series of small examples.
 
 [rbe]: http://rustbyexample.com/
 
-# The Standard Library
+# Language Reference
+
+Rust does not have an exact specification yet, but an effort to describe as much of
+the language in as much detail as possible is in [the reference](reference.html).
+
+# Standard Library Reference
 
 We have [API documentation for the entire standard
 library](std/index.html). There's a list of crates on the left with more
 specific sections, or you can use the search bar at the top to search for
 something if you know its name.
 
+# Tools
+
+[Cargo](https://crates.io) is the Rust's package manager providing access to libraries
+beyond the standard one, and its website contains lots of good documentation.
+
+[`rustdoc`](book/documentation.html) is the Rust's documentation generator, a tool converting
+annotated source code into HTML docs.
+
+A bunch of non-official tools are available, such as [Racer](https://github.com/phildawes/racer)
+(code completion engine), or [rustfmt](https://github.com/nrc/rustfmt) (source code formatter),
+or text editor plugins.
+
 # Community & Getting Help
 
 If you need help with something, or just want to talk about Rust with others,
@@ -54,25 +71,10 @@ There is an active [subreddit](https://reddit.com/r/rust) with lots of
 discussion and news about Rust.
 
 There is also a [user forum](https://users.rust-lang.org), for all
-user-oriented discussion, and a [developer 
+user-oriented discussion, and a [developer
 forum](https://internals.rust-lang.org/), where the development of Rust
 itself is discussed.
 
-# Specification
-
-Rust does not have an exact specification, but an effort to describe as much of
-the language in as much detail as possible is in [the reference](reference.html).
-
-# Tools
-
-Rust is still a young language, so there isn't a ton of tooling yet, but the
-tools we have are really nice.
-
-[Cargo](https://crates.io) is Rust's package manager, and its website contains
-lots of good documentation.
-
-[`rustdoc`](book/documentation.html) is used to generate documentation for Rust code.
-
 # FAQs
 
 There are questions that are asked quite often, so we've made FAQs for them:

branches/auto/src/doc/nomicon/vec-drain.md

@@ -129,14 +129,16 @@ impl<'a, T> Drop for Drain<'a, T> {
 
 impl<T> Vec<T> {
     pub fn drain(&mut self) -> Drain<T> {
-        // this is a mem::forget safety thing. If Drain is forgotten, we just
-        // leak the whole Vec's contents. Also we need to do this eventually
-        // anyway, so why not do it now?
-        self.len = 0;
-
         unsafe {
+            let iter = RawValIter::new(&self);
+
+            // this is a mem::forget safety thing. If Drain is forgotten, we just
+            // leak the whole Vec's contents. Also we need to do this *eventually*
+            // anyway, so why not do it now?
+            self.len = 0;
+
             Drain {
-                iter: RawValIter::new(&self),
+                iter: iter,
                 vec: PhantomData,
             }
         }

branches/auto/src/doc/nomicon/vec-final.md

@@ -155,13 +155,16 @@ impl<T> Vec<T> {
     }
 
     pub fn drain(&mut self) -> Drain<T> {
-        // this is a mem::forget safety thing. If this is forgotten, we just
-        // leak the whole Vec's contents. Also we need to do this *eventually*
-        // anyway, so why not do it now?
-        self.len = 0;
         unsafe {
+            let iter = RawValIter::new(&self);
+
+            // this is a mem::forget safety thing. If Drain is forgotten, we just
+            // leak the whole Vec's contents. Also we need to do this *eventually*
+            // anyway, so why not do it now?
+            self.len = 0;
+
             Drain {
-                iter: RawValIter::new(&self),
+                iter: iter,
                 vec: PhantomData,
             }
         }