Updated to new extern crate syntax.

Added warning for old deprecated syntax

diff --git a/src/driver/driver.rs b/src/driver/driver.rs
index ca462fc7a39226b9386b3775e0a5431248655949..8ac09ed909b6c6bad0d989684b27e889733263ab 100644 (file)
--- a/src/driver/driver.rs
+++ b/src/driver/driver.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 #[cfg(rustdoc)]
-extern crate this = "rustdoc";
+extern crate "rustdoc" as this;
 
 #[cfg(rustc)]
-extern crate this = "rustc";
+extern crate "rustc" as this;
 
 fn main() { this::main() }

diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs
index 1d25a0c31d8827691fdb62fc129f6dc49662d997..c79905b9595c25ca1e7a69159cc37bf1b9feb03b 100644 (file)
--- a/src/libregex/lib.rs
+++ b/src/libregex/lib.rs
@@ -372,7 +372,7 @@
 #![deny(missing_doc)]
 
 #[cfg(test)]
-extern crate stdtest = "test";
+extern crate "test" as stdtest;
 #[cfg(test)]
 extern crate rand;
 

diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
index ff8711c5df01f14fd9e26fad0b0ed477b65c1ef6..32e0c323d1f94f0014358340bfe0f2a74d1d4991 100644 (file)
--- a/src/librustc/front/std_inject.rs
+++ b/src/librustc/front/std_inject.rs
@@ -62,7 +62,7 @@ struct StandardLibraryInjector<'a> {
 impl<'a> fold::Folder for StandardLibraryInjector<'a> {
     fn fold_crate(&mut self, mut krate: ast::Crate) -> ast::Crate {
 
-        // The name to use in `extern crate std = "name";`
+        // The name to use in `extern crate "name" as std;`
         let actual_crate_name = match self.sess.opts.alt_std_name {
             Some(ref s) => token::intern_and_get_ident(s.as_slice()),
             None => token::intern_and_get_ident("std"),

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 0d4f4f556e16c6ef172847791164ff104a82dfa8..03dfcec18dbdb10d730a77c3107691d43b889b37 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -42,8 +42,8 @@
 extern crate getopts;
 extern crate graphviz;
 extern crate libc;
-extern crate llvm = "rustc_llvm";
-extern crate rustc_back = "rustc_back";
+extern crate "rustc_llvm" as llvm;
+extern crate "rustc_back" as rustc_back;
 extern crate serialize;
 extern crate rbml;
 extern crate time;

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 2f140aa8a6802c2841d08419a4b56821f621f48a..29e7c051162f33bddec99bf0c703e91e68900bfa 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -23,7 +23,7 @@
 extern crate rustc;
 extern crate serialize;
 extern crate syntax;
-extern crate testing = "test";
+extern crate "test" as testing;
 extern crate time;
 #[phase(plugin, link)] extern crate log;
 

diff --git a/src/librustrt/lib.rs b/src/librustrt/lib.rs
index 594e50d9913cc45da163bfa71b899c9796b7a3b0..b4ad1f23154b4d83a225ba0e4a594209b529d8c7 100644 (file)
--- a/src/librustrt/lib.rs
+++ b/src/librustrt/lib.rs
@@ -27,7 +27,7 @@
 extern crate libc;
 extern crate collections;
 
-#[cfg(test)] extern crate realrustrt = "rustrt";
+#[cfg(test)] extern crate "rustrt" as realrustrt;
 #[cfg(test)] extern crate test;
 #[cfg(test)] extern crate native;
 

diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs
index 561a4dffe82f2f6aef886041d404c698fd4ab14f..abc55b67b3bc82dd7c1b025676cd19660a132e9d 100644 (file)
--- a/src/librustuv/lib.rs
+++ b/src/librustuv/lib.rs
@@ -52,7 +52,7 @@
 
 #[cfg(test)] extern crate green;
 #[cfg(test)] extern crate debug;
-#[cfg(test)] extern crate realrustuv = "rustuv";
+#[cfg(test)] extern crate "rustuv" as realrustuv;
 extern crate libc;
 extern crate alloc;
 

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 7fed4c94164b6b75c07be6aa3f4c18093061955a..b29e5b7c14851b17797962dec9a214b17039aaaa 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -129,14 +129,14 @@
 extern crate alloc;
 extern crate unicode;
 extern crate core;
-extern crate core_collections = "collections";
-extern crate core_rand = "rand";
-extern crate core_sync = "sync";
+extern crate "collections" as core_collections;
+extern crate "rand" as core_rand;
+extern crate "sync" as core_sync;
 extern crate libc;
 extern crate rustrt;
 
 // Make std testable by not duplicating lang items. See #2912
-#[cfg(test)] extern crate realstd = "std";
+#[cfg(test)] extern crate "std" as realstd;
 #[cfg(test)] pub use realstd::kinds;
 #[cfg(test)] pub use realstd::ops;
 #[cfg(test)] pub use realstd::cmp;

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d3700059862522951df43f70d15a0b20c4678a39..66807c4639e0faf0a9ad25dfa3b5b7b079fbb2e5 100644 (file)
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4773,11 +4773,16 @@ fn parse_item_extern_crate(&mut self,
             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())
+                    let path = self.parse_str();
+                    let span = self.span;
+                    self.span_warn(span,
+                            format!("this extern crate syntax is deprecated. \
+                            Use: extern create \"{}\" as {};",
+                            the_ident.as_str(), path.ref0().get() ).as_slice()
+                    );
+                    Some(path)
                 } else {None};
 
                 self.expect(&token::SEMI);

diff --git a/src/test/compile-fail/issue-16725.rs b/src/test/compile-fail/issue-16725.rs
index f70d88a41cd1f5e02d09c5de65749771f69cf43c..218e9dba065b9ff0a0dfe62cf91550b4c4388cd2 100644 (file)
--- a/src/test/compile-fail/issue-16725.rs
+++ b/src/test/compile-fail/issue-16725.rs
@@ -10,7 +10,7 @@
 
 // aux-build:issue-16725.rs
 
-extern crate foo = "issue-16725";
+extern crate "issue-16725" as foo;
 
 fn main() {
     unsafe { foo::bar(); }

diff --git a/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs b/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
index ab97bad5bc2186e5b15d7633329d48024a647663..06f26800b5031cd20091d345cc13b05360f47d86 100644 (file)
--- a/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
+++ b/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
@@ -12,7 +12,7 @@
 
 // Check explicit region bounds on methods in the cross crate case.
 
-extern crate lib = "regions-bounded-method-type-parameters-cross-crate-lib";
+extern crate "regions-bounded-method-type-parameters-cross-crate-lib" as lib;
 
 use lib::Inv;
 use lib::MaybeOwned;

diff --git a/src/test/run-pass/issue-15562.rs b/src/test/run-pass/issue-15562.rs
index 96de6c90b66f0170ca474cebc9a6f40d485cd0ef..82f53ea7cd408a0333fef195c72d7269aebaf7c4 100644 (file)
--- a/src/test/run-pass/issue-15562.rs
+++ b/src/test/run-pass/issue-15562.rs
@@ -10,7 +10,7 @@
 
 // aux-build:issue-15562.rs
 
-extern crate i = "issue-15562";
+extern crate "issue-15562" as i;
 
 pub fn main() {
     extern {

diff --git a/src/test/run-pass/issue-16643.rs b/src/test/run-pass/issue-16643.rs
index db877aaafcaf95fc77693b551d275e59711db1ca..b118c9573cdcf751c9949b6e4ab0c603fad9d374 100644 (file)
--- a/src/test/run-pass/issue-16643.rs
+++ b/src/test/run-pass/issue-16643.rs
@@ -10,7 +10,7 @@
 
 // aux-build:issue-16643.rs
 
-extern crate i = "issue-16643";
+extern crate "issue-16643" as i;
 
 pub fn main() {
     i::TreeBuilder::<uint>.process_token();