---

yaml
---
r: 129583
b: refs/heads/master
c: 7bfcace
h: refs/heads/master
i:
  129581: 8f4ce91
  129579: a56a623
  129575: b265d7d
  129567: 35b4a93
v: v3

Author: MatejLach

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c73ab0c10b194d235a8a1aa18808125537c371d5
+refs/heads/master: 7bfcace03be0963c5c56efc56f1cb0f4992fe18e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 0d3bd7720c50e3ada4bac77331d43926493be4fe
 refs/heads/try: 80b45ddbd351f0a4a939c3a3c4e20b4defec4b35

trunk/src/doc/guide.md

@@ -1813,7 +1813,7 @@ 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!
 ```
@@ -1955,17 +1955,12 @@ fn main() {
 }
 ```
 
-... and then recompile:
+Try running our new program a few times:
 
 ```{notrust,ignore}
-$ 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
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 7
 Please input your guess.
@@ -2016,9 +2011,9 @@ fn main() {
 And trying it out:
 
 ```{notrust,ignore}
-$ cargo build
-   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 57
 Please input your guess.
@@ -2287,9 +2282,9 @@ 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 build
-   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 17
 Please input your guess.
@@ -2352,9 +2347,9 @@ fn cmp(a: uint, b: uint) -> Ordering {
 Let's try it!
 
 ```{notrust,ignore}
-$ cargo build
-   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 58
 Please input your guess.
@@ -2429,9 +2424,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 build
-   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 59
 Please input your guess.
@@ -2560,10 +2555,10 @@ fn cmp(a: uint, b: uint) -> Ordering {
 
 Now we should be good! Let's try:
 
-```{rust,ignore}
-$ cargo build
-   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+```{notrust,ignore}
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
+     Running `target/guessing_game`
 Guess the number!
 The secret number is: 61
 Please input your guess.
@@ -2804,7 +2799,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:
 

trunk/src/doc/rust.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

trunk/src/libglob/lib.rs

@@ -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") {

trunk/src/librustc/lint/builtin.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());
             }
         }
 

trunk/src/librustc/middle/intrinsicck.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,
             }
         }
     }

trunk/src/libsyntax/parse/parser.rs

@@ -4807,8 +4807,7 @@ impl<'a> Parser<'a> {
     /// # Example
     ///
     /// extern crate url;
-    /// extern crate foo = "bar"; //deprecated
-    /// extern crate "bar" as foo;
+    /// extern crate foo = "bar";
     fn parse_item_extern_crate(&mut self,
                                 lo: BytePos,
                                 visibility: Visibility,
@@ -4819,23 +4818,14 @@ impl<'a> Parser<'a> {
             token::IDENT(..) => {
                 let the_ident = self.parse_ident();
                 self.expect_one_of(&[], &[token::EQ, token::SEMI]);
-                // NOTE - #16689 change this to a warning once
-                //        the 'as' support is in stage0
                 let path = if self.token == token::EQ {
                     self.bump();
                     Some(self.parse_str())
                 } else {None};
 
                 self.expect(&token::SEMI);
                 (path, the_ident)
-            },
-            token::LIT_STR(..) | token::LIT_STR_RAW(..) => {
-                let path = self.parse_str();
-                self.expect_keyword(keywords::As);
-                let the_ident = self.parse_ident();
-                self.expect(&token::SEMI);
-                (Some(path), the_ident)
-            },
+            }
             _ => {
                 let span = self.span;
                 let token_str = self.this_token_to_string();

trunk/src/libsyntax/print/pprust.rs

@@ -2363,13 +2363,13 @@ impl<'a> State<'a> {
         match item.node {
             ast::ViewItemExternCrate(id, ref optional_path, _) => {
                 try!(self.head("extern crate"));
+                try!(self.print_ident(id));
                 for &(ref p, style) in optional_path.iter() {
-                    try!(self.print_string(p.get(), style));
                     try!(space(&mut self.s));
-                    try!(word(&mut self.s, "as"));
+                    try!(word(&mut self.s, "="));
                     try!(space(&mut self.s));
+                    try!(self.print_string(p.get(), style));
                 }
-                try!(self.print_ident(id));
             }
 
             ast::ViewItemUse(ref vp) => {

trunk/src/test/auxiliary/crateresolve4b-1.rs

@@ -13,6 +13,6 @@
 #![crate_id="crateresolve4b#0.1"]
 #![crate_type = "lib"]
 
-extern crate "crateresolve4a#0.2" as crateresolve4a;
+extern crate crateresolve4a = "crateresolve4a#0.2";
 
 pub fn f() -> int { crateresolve4a::g() }

trunk/src/test/auxiliary/crateresolve4b-2.rs

@@ -13,6 +13,6 @@
 #![crate_id="crateresolve4b#0.2"]
 #![crate_type = "lib"]
 
-extern crate "crateresolve4a#0.1" as crateresolve4a;
+extern crate crateresolve4a = "crateresolve4a#0.1";
 
 pub fn g() -> int { crateresolve4a::f() }

trunk/src/test/auxiliary/issue-12133-dylib2.rs

@@ -12,6 +12,6 @@
 
 #![crate_type = "dylib"]
 
-extern crate "issue-12133-rlib" as a;
-extern crate "issue-12133-dylib" as b;
+extern crate a = "issue-12133-rlib";
+extern crate b = "issue-12133-dylib";
 

trunk/src/test/auxiliary/issue-13560-3.rs

@@ -13,6 +13,6 @@
 #![crate_type = "rlib"]
 #![feature(phase)]
 
-#[phase(plugin)] extern crate "issue-13560-1" as t1;
-#[phase(plugin, link)] extern crate "issue-13560-2" as t2;
+#[phase(plugin)] extern crate t1 = "issue-13560-1";
+#[phase(plugin, link)] extern crate t2 = "issue-13560-2";
 

trunk/src/test/auxiliary/issue-13620-2.rs

@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate "issue-13620-1" as crate1;
+extern crate crate1 = "issue-13620-1";
 
 pub static FOO2: crate1::Foo = crate1::FOO;

trunk/src/test/auxiliary/issue-13872-2.rs

@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate "issue-13872-1" as foo;
+extern crate foo = "issue-13872-1";
 
 pub use foo::B;

trunk/src/test/auxiliary/issue-13872-3.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate "issue-13872-2" as bar;
+extern crate bar = "issue-13872-2";
 
 use bar::B;
 

trunk/src/test/auxiliary/issue-15562.rs

@@ -14,7 +14,7 @@
 #![crate_type = "dylib"]
 #![feature(plugin_registrar, quote, globs)]
 
-extern crate "syntax-extension-with-dll-deps-1" as other;
+extern crate other = "syntax-extension-with-dll-deps-1";
 extern crate syntax;
 extern crate rustc;
 

trunk/src/test/auxiliary/syntax-extension-with-dll-deps-2.rs

@@ -10,7 +10,7 @@
 
 // aux-build:trait_default_method_xc_aux.rs
 
-extern crate "trait_default_method_xc_aux" as aux;
+extern crate aux = "trait_default_method_xc_aux";
 use aux::A;
 
 pub struct a_struct { pub x: int }

trunk/src/test/auxiliary/trait_default_method_xc_aux_2.rs

@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate "" as foo; //~ ERROR: crate name must not be empty
+extern crate foo = ""; //~ ERROR: crate name must not be empty
 
 fn main() {}

trunk/src/test/compile-fail/bad-crate-id.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate "#a" as bar; //~ ERROR: invalid character `#` in crate name: `#a`
+extern crate bar = "#a"; //~ ERROR: invalid character `#` in crate name: `#a`
 
 fn main() {}
 

trunk/src/test/compile-fail/bad-crate-id2.rs

@@ -10,7 +10,7 @@
 
 // aux-build:issue-11680.rs
 
-extern crate "issue-11680" as other;
+extern crate other = "issue-11680";
 
 fn main() {
     let _b = other::Bar(1);