---

yaml
---
r: 129610
b: refs/heads/auto
c: bcb0717
h: refs/heads/master
v: v3

Author: SiegeLord

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0d3bd7720c50e3ada4bac77331d43926493be4fe
+refs/heads/auto: bcb07175ceca3e9a4b2644625bb510fa3f3d7368
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/guide-tasks.md

@@ -1801,6 +1801,7 @@ Let's try compiling what Cargo gave us:
 ```{bash}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$
 ```
 
 Excellent! Open up your `src/main.rs` again. We'll be writing all of
@@ -1813,9 +1814,10 @@ Try it out:
 
 ```{notrust,ignore}
 $ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+   Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
      Running `target/guessing_game`
 Hello, world!
+$
 ```
 
 Great! The `run` command comes in handy when you need to rapidly iterate on a project.
@@ -1955,12 +1957,18 @@ fn main() {
 }
 ```
 
-Try running our new program a few times:
+... and then recompile:
 
 ```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+$ cargo build
+  Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$
+```
+
+Excellent! Try running our new program a few times:
+
+```{notrust,ignore}
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 7
 Please input your guess.
@@ -2011,9 +2019,9 @@ fn main() {
 And trying it out:
 
 ```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+$ cargo build
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 57
 Please input your guess.
@@ -2282,14 +2290,15 @@ We use a `match` to either give us the `uint` inside of the `Option`, or we
 print an error message and return. Let's give this a shot:
 
 ```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+$ cargo build
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 17
 Please input your guess.
 5
 Please input a number!
+$
 ```
 
 Uh, what? But we did!
@@ -2347,15 +2356,16 @@ fn cmp(a: uint, b: uint) -> Ordering {
 Let's try it!
 
 ```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+$ cargo build
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 58
 Please input your guess.
   76
 You guessed: 76
 Too big!
+$
 ```
 
 Nice! You can see I even added spaces before my guess, and it still figured
@@ -2424,9 +2434,9 @@ And try it out. But wait, didn't we just add an infinite loop? Yup. Remember
 that `return`? If we give a non-number answer, we'll `return` and quit. Observe:
 
 ```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+$ cargo build
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 59
 Please input your guess.
@@ -2444,6 +2454,7 @@ You win!
 Please input your guess.
 quit
 Please input a number!
+$
 ```
 
 Ha! `quit` actually quits. As does any other non-number input. Well, this is
@@ -2555,10 +2566,10 @@ fn cmp(a: uint, b: uint) -> Ordering {
 
 Now we should be good! Let's try:
 
-```{notrust,ignore}
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
-     Running `target/guessing_game`
+```{rust,ignore}
+$ cargo build
+   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 61
 Please input your guess.
@@ -2760,6 +2771,7 @@ $ cargo run
    Compiling modules v0.0.1 (file:///home/you/projects/modules)
      Running `target/modules`
 Hello, world!
+$
 ```
 
 Nice!
@@ -2799,7 +2811,8 @@ be named, by convention.
 Next, we added an `extern crate modules` to the top of our `src/main.rs`. This,
 as you can guess, lets Rust know that our crate relies on another, external
 crate. We also had to modify our call to `print_hello`: now that it's in
-another crate, we need to specify that crate first.
+another crate, we need to first specify the crate, then the module inside of it,
+then the function name.
 
 This doesn't _quite_ work yet. Try it:
 
@@ -2910,6 +2923,7 @@ This should all compile as usual:
 ```{notrust,ignore}
 $ cargo build
    Compiling modules v0.0.1 (file:///home/you/projects/modules)
+$
 ```
 
 We've seen how the `::` operator can be used to call into modules, but when
@@ -3083,6 +3097,7 @@ $ cargo run
    Compiling testing v0.0.1 (file:///home/you/projects/testing)
      Running `target/testing`
 Hello, world!
+$
 ```
 
 Great. Rust's infrastructure supports tests in two sorts of places, and they're
@@ -3235,6 +3250,7 @@ running 1 test
 test foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+$
 ```
 
 Nice! Our test passes, as we expected. Let's get rid of that warning for our `main`

branches/auto/src/doc/guide.md

@@ -891,8 +891,9 @@ There are several kinds of view item:
 ##### Extern crate declarations
 
 ~~~~ {.ebnf .gram}
-extern_crate_decl : "extern" "crate" crate_name
-crate_name: ident | ( string_lit as ident )
+extern_crate_decl : "extern" "crate" ident [ '(' link_attrs ')' ] ? [ '=' string_lit ] ? ;
+link_attrs : link_attr [ ',' link_attrs ] + ;
+link_attr : ident '=' literal ;
 ~~~~
 
 An _`extern crate` declaration_ specifies a dependency on an external crate.
@@ -912,9 +913,11 @@ Four examples of `extern crate` declarations:
 ~~~~ {.ignore}
 extern crate pcre;
 
-extern crate std; // equivalent to: extern crate std as std;
+extern crate std; // equivalent to: extern crate std = "std";
 
-extern crate "std" as ruststd; // linking to 'std' under another name
+extern crate ruststd = "std"; // linking to 'std' under another name
+
+extern crate foo = "some/where/rust-foo#foo:1.0"; // a full crate ID for external tools
 ~~~~
 
 ##### Use declarations

branches/auto/src/doc/rust.md

@@ -24,16 +24,14 @@
  */
 
 #![crate_name = "glob"]
-#![deprecated = "This is now a cargo package located at: \
-                 https://github.com/rust-lang/glob"]
+#![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/master/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(deprecated)]
 
 use std::cell::Cell;
 use std::{cmp, os, path};
@@ -66,7 +64,6 @@ pub struct Paths {
 /// `puppies.jpg` and `hamsters.gif`:
 ///
 /// ```rust
-/// # #![allow(deprecated)]
 /// use glob::glob;
 ///
 /// for path in glob("/media/pictures/*.jpg") {

branches/auto/src/libglob/lib.rs

@@ -754,7 +754,7 @@ impl LintPass for NonCamelCaseTypes {
 
             // start with a non-lowercase letter rather than non-uppercase
             // ones (some scripts don't have a concept of upper/lowercase)
-            ident.len() > 0 && !ident.char_at(0).is_lowercase() && !ident.contains_char('_')
+            !ident.char_at(0).is_lowercase() && !ident.contains_char('_')
         }
 
         fn to_camel_case(s: &str) -> String {
@@ -768,13 +768,9 @@ impl LintPass for NonCamelCaseTypes {
             let s = token::get_ident(ident);
 
             if !is_camel_case(ident) {
-                let c = to_camel_case(s.get());
-                let m = if c.is_empty() {
-                    format!("{} `{}` should have a camel case name such as `CamelCase`", sort, s)
-                } else {
-                    format!("{} `{}` should have a camel case name such as `{}`", sort, s, c)
-                };
-                cx.span_lint(NON_CAMEL_CASE_TYPES, span, m.as_slice());
+                cx.span_lint(NON_CAMEL_CASE_TYPES, span,
+                    format!("{} `{}` should have a camel case name such as `{}`",
+                            sort, s, to_camel_case(s.get())).as_slice());
             }
         }
 

branches/auto/src/librustc/lint/builtin.rs

@@ -73,25 +73,21 @@ struct IntrinsicCheckingVisitor<'a> {
 
 impl<'a> IntrinsicCheckingVisitor<'a> {
     fn def_id_is_transmute(&self, def_id: DefId) -> bool {
-        let intrinsic = match ty::get(ty::lookup_item_type(self.tcx, def_id).ty).sty {
-            ty::ty_bare_fn(ref bfty) => bfty.abi == RustIntrinsic,
-            _ => return false
-        };
         if def_id.krate == ast::LOCAL_CRATE {
             match self.tcx.map.get(def_id.node) {
-                NodeForeignItem(ref item) if intrinsic => {
+                NodeForeignItem(ref item) => {
                     token::get_ident(item.ident) ==
                         token::intern_and_get_ident("transmute")
                 }
                 _ => false,
             }
         } else {
             match csearch::get_item_path(self.tcx, def_id).last() {
-                Some(ref last) if intrinsic => {
+                None => false,
+                Some(ref last) => {
                     token::get_name(last.name()) ==
                         token::intern_and_get_ident("transmute")
                 }
-                _ => false,
             }
         }
     }

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

@@ -124,7 +124,14 @@ fn try_inline_def(cx: &core::DocContext,
 pub fn load_attrs(tcx: &ty::ctxt, did: ast::DefId) -> Vec<clean::Attribute> {
     let mut attrs = Vec::new();
     csearch::get_item_attrs(&tcx.sess.cstore, did, |v| {
-        attrs.extend(v.move_iter().map(|a| {
+        attrs.extend(v.move_iter().map(|mut a| {
+            // FIXME this isn't quite always true, it's just true about 99% of
+            //       the time when dealing with documentation. For example,
+            //       this would treat doc comments of the form `#[doc = "foo"]`
+            //       incorrectly.
+            if a.name().get() == "doc" && a.value_str().is_some() {
+                a.node.is_sugared_doc = true;
+            }
             a.clean()
         }));
     });

branches/auto/src/librustdoc/clean/inline.rs

@@ -819,16 +819,17 @@ impl DocFolder for Cache {
         // Index this method for searching later on
         match item.name {
             Some(ref s) => {
-                let parent = match item.inner {
+                let (parent, is_method) = match item.inner {
                     clean::TyMethodItem(..) |
                     clean::StructFieldItem(..) |
                     clean::VariantItem(..) => {
-                        (Some(*self.parent_stack.last().unwrap()),
-                         Some(self.stack.slice_to(self.stack.len() - 1)))
+                        ((Some(*self.parent_stack.last().unwrap()),
+                          Some(self.stack.slice_to(self.stack.len() - 1))),
+                          false)
                     }
                     clean::MethodItem(..) => {
                         if self.parent_stack.len() == 0 {
-                            (None, None)
+                            ((None, None), false)
                         } else {
                             let last = self.parent_stack.last().unwrap();
                             let did = *last;
@@ -844,17 +845,18 @@ impl DocFolder for Cache {
                                 Some(..) => Some(self.stack.as_slice()),
                                 None => None
                             };
-                            (Some(*last), path)
+                            ((Some(*last), path), true)
                         }
                     }
-                    _ => (None, Some(self.stack.as_slice()))
+                    _ => ((None, Some(self.stack.as_slice())), false)
                 };
                 let hidden_field = match item.inner {
                     clean::StructFieldItem(clean::HiddenStructField) => true,
                     _ => false
                 };
+
                 match parent {
-                    (parent, Some(path)) if !self.privmod && !hidden_field => {
+                    (parent, Some(path)) if is_method || (!self.privmod && !hidden_field) => {
                         self.search_index.push(IndexItem {
                             ty: shortty(&item),
                             name: s.to_string(),
@@ -863,7 +865,7 @@ impl DocFolder for Cache {
                             parent: parent,
                         });
                     }
-                    (Some(parent), None) if !self.privmod => {
+                    (Some(parent), None) if is_method || (!self.privmod && !hidden_field)=> {
                         if ast_util::is_local(parent) {
                             // We have a parent, but we don't know where they're
                             // defined yet. Wait for later to index this item.

branches/auto/src/librustdoc/html/render.rs

@@ -85,7 +85,6 @@ mod imp {
         marker: marker::NoCopy
     }
 
-    #[repr(C)]
     struct SecRandom;
 
     static kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;

branches/auto/src/libstd/rand/os.rs

@@ -86,8 +86,6 @@
 //!
 //! ```
 //! // Create a shared channel which can be sent along from many tasks
-//! // where tx is the sending half (tx for transmission), and rx is the receiving
-//! // half (rx for receiving).
 //! let (tx, rx) = channel();
 //! for i in range(0i, 10i) {
 //!     let tx = tx.clone();
@@ -475,8 +473,6 @@ impl<T> UnsafeFlavor<T> for Receiver<T> {
 /// # Example
 ///
 /// ```
-/// // tx is is the sending half (tx for transmission), and rx is the receiving
-/// // half (rx for receiving).
 /// let (tx, rx) = channel();
 ///
 /// // Spawn off an expensive computation