---

yaml
---
r: 231807
b: refs/heads/auto
c: 201bfbe
h: refs/heads/master
i:
  231805: a165319
  231803: b9eaad9
  231799: 41d6673
  231791: cc04288
  231775: 26e00ac
  231743: 5aff809
  231679: 12dac55
v: v3

Author: petrochenkov

[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: a269e31a30446bb0dc4ae36d170e507e31188bfe
+refs/heads/auto: 201bfbe55e6852cc41160f29b617439c7098a128
 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,28 @@ series of small examples.
 
 [rbe]: http://rustbyexample.com/
 
+# 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).
+
 # The Standard Library
 
 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
+
+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.
+
 # Community & Getting Help
 
 If you need help with something, or just want to talk about Rust with others,
@@ -54,25 +69,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,16 +129,14 @@ impl<'a, T> Drop for Drain<'a, T> {
 
 impl<T> Vec<T> {
     pub fn drain(&mut self) -> Drain<T> {
-        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;
+        // 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 {
             Drain {
-                iter: iter,
+                iter: RawValIter::new(&self),
                 vec: PhantomData,
             }
         }

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

@@ -155,16 +155,13 @@ 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: iter,
+                iter: RawValIter::new(&self),
                 vec: PhantomData,
             }
         }

branches/auto/src/doc/trpl/macros.md

@@ -313,7 +313,7 @@ fn main() {
 }
 ```
 
-This works because Rust has a [hygienic macro system][https://en.wikipedia.org/wiki/Hygienic_macro]. Each macro expansion
+This works because Rust has a [hygienic macro system][]. Each macro expansion
 happens in a distinct ‘syntax context’, and each variable is tagged with the
 syntax context where it was introduced. It’s as though the variable `state`
 inside `main` is painted a different "color" from the variable `state` inside

branches/auto/src/librustc/middle/region.rs

@@ -317,10 +317,7 @@ impl RegionMaps {
         self.intern_code_extent(e, DUMMY_CODE_EXTENT)
     }
     pub fn lookup_code_extent(&self, e: CodeExtentData) -> CodeExtent {
-        match self.code_extent_interner.borrow().get(&e) {
-            Some(&d) => d,
-            None => panic!("unknown code extent {:?}", e)
-        }
+        self.code_extent_interner.borrow()[&e]
     }
     pub fn node_extent(&self, n: ast::NodeId) -> CodeExtent {
         self.lookup_code_extent(CodeExtentData::Misc(n))
@@ -1072,7 +1069,7 @@ fn resolve_item(visitor: &mut RegionResolutionVisitor, item: &hir::Item) {
 }
 
 fn resolve_fn(visitor: &mut RegionResolutionVisitor,
-              kind: FnKind,
+              _: FnKind,
               decl: &hir::FnDecl,
               body: &hir::Block,
               sp: Span,
@@ -1105,7 +1102,6 @@ fn resolve_fn(visitor: &mut RegionResolutionVisitor,
     };
 
     visit::walk_fn_decl(visitor, decl);
-    visit::walk_fn_kind(visitor, kind);
 
     // The body of the every fn is a root scope.
     visitor.cx = Context {

branches/auto/src/librustc_front/visit.rs

@@ -580,8 +580,13 @@ pub fn walk_fn_decl<'v, V: Visitor<'v>>(visitor: &mut V, function_declaration: &
     walk_fn_ret_ty(visitor, &function_declaration.output)
 }
 
-pub fn walk_fn_kind<'v, V: Visitor<'v>>(visitor: &mut V,
-                                        function_kind: FnKind<'v>) {
+pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
+                                   function_kind: FnKind<'v>,
+                                   function_declaration: &'v FnDecl,
+                                   function_body: &'v Block,
+                                   _span: Span) {
+    walk_fn_decl(visitor, function_declaration);
+
     match function_kind {
         FnKind::ItemFn(_, generics, _, _, _, _) => {
             visitor.visit_generics(generics);
@@ -592,15 +597,7 @@ pub fn walk_fn_kind<'v, V: Visitor<'v>>(visitor: &mut V,
         }
         FnKind::Closure(..) => {}
     }
-}
 
-pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
-                                   function_kind: FnKind<'v>,
-                                   function_declaration: &'v FnDecl,
-                                   function_body: &'v Block,
-                                   _span: Span) {
-    walk_fn_decl(visitor, function_declaration);
-    walk_fn_kind(visitor, function_kind);
     visitor.visit_block(function_body)
 }