Remove extern mod foo (name="bar") syntax, closes #9543

fhahn · fhahn · commit f42a36cded2a · 2014-01-01T23:36:57.000+01:00
diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
@@ -21,8 +21,6 @@ use syntax::fold;
 use syntax::opt_vec;
 use syntax::util::small_vector::SmallVector;
 
-static STD_VERSION: &'static str = "0.9-pre";
-
 pub fn maybe_inject_libstd_ref(sess: Session, crate: ast::Crate)
                                -> ast::Crate {
     if use_std(&crate) {
@@ -57,12 +55,9 @@ struct StandardLibraryInjector {
 
 impl fold::ast_fold for StandardLibraryInjector {
     fn fold_crate(&mut self, crate: ast::Crate) -> ast::Crate {
-        let version = STD_VERSION.to_managed();
-        let vers_item = attr::mk_name_value_item_str(@"vers", version);
         let mut vis = ~[ast::view_item {
             node: ast::view_item_extern_mod(self.sess.ident_of("std"),
                                             None,
-                                            ~[vers_item.clone()],
                                             ast::DUMMY_NODE_ID),
             attrs: ~[],
             vis: ast::private,
@@ -73,7 +68,6 @@ impl fold::ast_fold for StandardLibraryInjector {
             vis.push(ast::view_item {
                 node: ast::view_item_extern_mod(self.sess.ident_of("green"),
                                                 None,
-                                                ~[vers_item],
                                                 ast::DUMMY_NODE_ID),
                 attrs: ~[],
                 vis: ast::private,
@@ -82,7 +76,6 @@ impl fold::ast_fold for StandardLibraryInjector {
             vis.push(ast::view_item {
                 node: ast::view_item_extern_mod(self.sess.ident_of("rustuv"),
                                                 None,
-                                                ~[vers_item],
                                                 ast::DUMMY_NODE_ID),
                 attrs: ~[],
                 vis: ast::private,
diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs
@@ -291,8 +291,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
                                             path_node(~[id_extra]),
                                             ast::DUMMY_NODE_ID))])
     } else {
-        let mi = attr::mk_name_value_item_str(@"vers", @"0.9-pre");
-        ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
+        ast::view_item_extern_mod(id_extra, None, ast::DUMMY_NODE_ID)
     };
     ast::view_item {
         node: vi,
diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs
@@ -132,7 +132,7 @@ fn visit_crate(e: &Env, c: &ast::Crate) {
 
 fn visit_view_item(e: &mut Env, i: &ast::view_item) {
     match i.node {
-      ast::view_item_extern_mod(ident, path_opt, _, id) => {
+      ast::view_item_extern_mod(ident, path_opt, id) => {
           let ident = token::ident_to_str(&ident);
           debug!("resolving extern mod stmt. ident: {:?} path_opt: {:?}",
                  ident, path_opt);
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
@@ -1507,7 +1507,7 @@ impl Resolver {
                 }
             }
 
-            view_item_extern_mod(name, _, _, node_id) => {
+            view_item_extern_mod(name, _, node_id) => {
                 // n.b. we don't need to look at the path option here, because cstore already did
                 match self.session.cstore.find_extern_mod_stmt_cnum(node_id) {
                     Some(crate_id) => {
diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs
@@ -994,15 +994,15 @@ impl Clean<Item> for ast::view_item {
 
 #[deriving(Clone, Encodable, Decodable)]
 pub enum ViewItemInner {
-    ExternMod(~str, Option<~str>, ~[Attribute], ast::NodeId),
+    ExternMod(~str, Option<~str>, ast::NodeId),
     Import(~[ViewPath])
 }
 
 impl Clean<ViewItemInner> for ast::view_item_ {
     fn clean(&self) -> ViewItemInner {
         match self {
-            &ast::view_item_extern_mod(ref i, ref p, ref mi, ref id) =>
-                ExternMod(i.clean(), p.map(|(ref x, _)| x.to_owned()),  mi.clean(), *id),
+            &ast::view_item_extern_mod(ref i, ref p, ref id) =>
+                ExternMod(i.clean(), p.map(|(ref x, _)| x.to_owned()), *id),
             &ast::view_item_use(ref vp) => Import(vp.clean())
         }
     }
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
@@ -995,7 +995,7 @@ fn item_module(w: &mut Writer, cx: &Context,
 
             clean::ViewItemItem(ref item) => {
                 match item.inner {
-                    clean::ExternMod(ref name, ref src, _, _) => {
+                    clean::ExternMod(ref name, ref src, _) => {
                         write!(w, "<tr><td><code>extern mod {}",
                                name.as_slice());
                         match *src {
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
@@ -461,7 +461,7 @@ impl<'a> Visitor<()> for ViewItemVisitor<'a> {
 
         match vi.node {
             // ignore metadata, I guess
-            ast::view_item_extern_mod(lib_ident, path_opt, _, _) => {
+            ast::view_item_extern_mod(lib_ident, path_opt, _) => {
                 let lib_name = match path_opt {
                     Some((p, _)) => p,
                     None => self.sess.str_of(lib_ident)
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -1057,7 +1057,7 @@ pub enum view_item_ {
     // optional @str: if present, this is a location (containing
     // arbitrary characters) from which to fetch the crate sources
     // For example, extern mod whatever = "github.com/mozilla/rust"
-    view_item_extern_mod(Ident, Option<(@str, StrStyle)>, ~[@MetaItem], NodeId),
+    view_item_extern_mod(Ident, Option<(@str, StrStyle)>, NodeId),
     view_item_use(~[@view_path]),
 }
 
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
@@ -419,7 +419,7 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
 
     fn visit_view_item(&mut self, view_item: &view_item, env: ()) {
         match view_item.node {
-            view_item_extern_mod(_, _, _, node_id) => {
+            view_item_extern_mod(_, _, node_id) => {
                 self.operation.visit_id(node_id)
             }
             view_item_use(ref view_paths) => {
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
@@ -66,11 +66,9 @@ pub trait ast_fold {
         let inner_view_item = match vi.node {
             view_item_extern_mod(ref ident,
                                  string,
-                                 ref meta_items,
                                  node_id) => {
                 view_item_extern_mod(ident.clone(),
                                      string,
-                                     self.fold_meta_items(*meta_items),
                                      self.new_id(node_id))
             }
             view_item_use(ref view_paths) => {
diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs
@@ -45,6 +45,7 @@ pub enum ObsoleteSyntax {
     ObsoleteBoxedClosure,
     ObsoleteClosureType,
     ObsoleteMultipleImport,
+    ObsoleteExternModAttributesInParens
 }
 
 impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -145,6 +146,11 @@ impl ParserObsoleteMethods for Parser {
                 "multiple imports",
                 "only one import is allowed per `use` statement"
             ),
+            ObsoleteExternModAttributesInParens => (
+                "`extern mod` with linkage attribute list",
+                "use `extern mod foo = \"bar\";` instead of \
+                `extern mod foo (name = \"bar\")`"
+            )
         };
 
         self.report(sp, kind, kind_str, desc);
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -4446,11 +4446,18 @@ impl Parser {
             self.span_err(*self.span, "an ABI may not be specified here");
         }
 
+
+        if *self.token == token::LPAREN {
+            // `extern mod foo (name = "bar"[,vers = "version"]) is obsolete,
+            // `extern mod foo = "bar#[version]";` should be used.
+            // Parse obsolete options to avoid wired parser errors
+            self.parse_optional_meta();
+            self.obsolete(*self.span, ObsoleteExternModAttributesInParens);
+        }
         // extern mod foo;
-        let metadata = self.parse_optional_meta();
         self.expect(&token::SEMI);
         iovi_view_item(ast::view_item {
-            node: view_item_extern_mod(ident, maybe_path, metadata, ast::DUMMY_NODE_ID),
+            node: view_item_extern_mod(ident, maybe_path, ast::DUMMY_NODE_ID),
             attrs: attrs,
             vis: visibility,
             span: mk_sp(lo, self.last_span.hi)
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -1952,7 +1952,7 @@ pub fn print_view_item(s: @ps, item: &ast::view_item) {
     print_outer_attributes(s, item.attrs);
     print_visibility(s, item.vis);
     match item.node {
-        ast::view_item_extern_mod(id, ref optional_path, ref mta, _) => {
+        ast::view_item_extern_mod(id, ref optional_path, _) => {
             head(s, "extern mod");
             print_ident(s, id);
             for &(ref p, style) in optional_path.iter() {
@@ -1961,11 +1961,6 @@ pub fn print_view_item(s: @ps, item: &ast::view_item) {
                 space(s.s);
                 print_string(s, *p, style);
             }
-            if !mta.is_empty() {
-                popen(s);
-                commasep(s, consistent, *mta, |p, &i| print_meta_item(p, i));
-                pclose(s);
-            }
         }
 
         ast::view_item_use(ref vps) => {
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
@@ -139,7 +139,7 @@ pub fn walk_mod<E:Clone, V:Visitor<E>>(visitor: &mut V, module: &_mod, env: E) {
 
 pub fn walk_view_item<E:Clone, V:Visitor<E>>(visitor: &mut V, vi: &view_item, env: E) {
     match vi.node {
-        view_item_extern_mod(name, _, _, _) => {
+        view_item_extern_mod(name, _, _) => {
             visitor.visit_ident(vi.span, name, env)
         }
         view_item_use(ref paths) => {
diff --git a/src/test/run-pass/crateresolve8.rs b/src/test/run-pass/crateresolve8.rs
@@ -13,7 +13,7 @@
 
 #[crate_id="crateresolve8#0.1"];
 
-extern mod crateresolve8(vers = "0.1", package_id="crateresolve8#0.1");
+extern mod crateresolve8 = "crateresolve8#0.1";
 //extern mod crateresolve8(vers = "0.1");
 
 pub fn main() {
diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/run-pass/extern-crosscrate.rs
@@ -11,7 +11,7 @@
 // xfail-fast
 //aux-build:extern-crosscrate-source.rs
 
-extern mod externcallback(vers = "0.1");
+extern mod externcallback = "externcallback#0.1";
 
 fn fact(n: uint) -> uint {
     unsafe {
diff --git a/src/test/run-pass/issue-6919.rs b/src/test/run-pass/issue-6919.rs
@@ -12,7 +12,6 @@
 // xfail-fast
 
 #[crate_id="issue-6919"];
-
 extern mod issue6919_3;
 
 pub fn main() {

Original file line number	Diff line number	Diff line change
`@@ -1507,7 +1507,7 @@ impl Resolver {`
`1507`	`1507`	`}`
`1508`	`1508`	`}`
`1509`	`1509`
`1510`		`- view_item_extern_mod(name, _, _, node_id) => {`
	`1510`	`+ view_item_extern_mod(name, _, node_id) => {`
`1511`	`1511`	`// n.b. we don't need to look at the path option here, because cstore already did`
`1512`	`1512`	`match self.session.cstore.find_extern_mod_stmt_cnum(node_id) {`
`1513`	`1513`	`Some(crate_id) => {`
Original file line number	Diff line number	Diff line change
`@@ -994,15 +994,15 @@ impl Clean<Item> for ast::view_item {`
`994`	`994`
`995`	`995`	`#[deriving(Clone, Encodable, Decodable)]`
`996`	`996`	`pub enum ViewItemInner {`
`997`		`- ExternMod(~str, Option<~str>, ~[Attribute], ast::NodeId),`
	`997`	`+ ExternMod(~str, Option<~str>, ast::NodeId),`
`998`	`998`	`Import(~[ViewPath])`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`	`impl Clean<ViewItemInner> for ast::view_item_ {`
`1002`	`1002`	`fn clean(&self) -> ViewItemInner {`
`1003`	`1003`	`match self {`
`1004`		`- &ast::view_item_extern_mod(ref i, ref p, ref mi, ref id) =>`
`1005`		`- ExternMod(i.clean(), p.map(\|(ref x, _)\| x.to_owned()), mi.clean(), *id),`
	`1004`	`+ &ast::view_item_extern_mod(ref i, ref p, ref id) =>`
	`1005`	`+ ExternMod(i.clean(), p.map(\|(ref x, _)\| x.to_owned()), *id),`
`1006`	`1006`	`&ast::view_item_use(ref vp) => Import(vp.clean())`
`1007`	`1007`	`}`
`1008`	`1008`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1057,7 +1057,7 @@ pub enum view_item_ {`
`1057`	`1057`	`// optional @str: if present, this is a location (containing`
`1058`	`1058`	`// arbitrary characters) from which to fetch the crate sources`
`1059`	`1059`	`// For example, extern mod whatever = "github.com/mozilla/rust"`
`1060`		`- view_item_extern_mod(Ident, Option<(@str, StrStyle)>, ~[@MetaItem], NodeId),`
	`1060`	`+ view_item_extern_mod(Ident, Option<(@str, StrStyle)>, NodeId),`
`1061`	`1061`	`view_item_use(~[@view_path]),`
`1062`	`1062`	`}`
`1063`	`1063`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {`
`419`	`419`
`420`	`420`	`fn visit_view_item(&mut self, view_item: &view_item, env: ()) {`
`421`	`421`	`match view_item.node {`
`422`		`- view_item_extern_mod(_, _, _, node_id) => {`
	`422`	`+ view_item_extern_mod(_, _, node_id) => {`
`423`	`423`	`self.operation.visit_id(node_id)`
`424`	`424`	`}`
`425`	`425`	`view_item_use(ref view_paths) => {`