about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-12-19 07:51:36 -0800
committerbors <bors@rust-lang.org>2013-12-19 07:51:36 -0800
commitd760f994de00f4e700a03a650e5065c8391b7f73 (patch)
treef44ef0214f28cdc830782210837805898b76c398 /src/libsyntax
parente86cdaf23ded0d25582a33fea761963cf0eb4f41 (diff)
parentb25a0524dcb1e46b9c55266ebc0ab36cce5d2099 (diff)
downloadrust-d760f994de00f4e700a03a650e5065c8391b7f73.tar.gz
rust-d760f994de00f4e700a03a650e5065c8391b7f73.zip
auto merge of #11041 : cmr/rust/pkgid_changes, r=cmr,metajack
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/attr.rs2
-rw-r--r--src/libsyntax/lib.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index ac5254f1aba..5e16213190c 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -237,7 +237,7 @@ pub fn find_linkage_metas(attrs: &[Attribute]) -> ~[@MetaItem] {
 }
 
 pub fn find_pkgid(attrs: &[Attribute]) -> Option<PkgId> {
-    match first_attr_value_str_by_name(attrs, "pkgid") {
+    match first_attr_value_str_by_name(attrs, "crate_id") {
         None => None,
         Some(id) => from_str::<PkgId>(id),
     }
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 9599f27af04..25986f67c69 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -13,7 +13,9 @@
  *  macros.
  */
 
+// NOTE: remove pkgid after snapshot
 #[pkgid = "syntax#0.9-pre"];
+#[crate_id = "syntax#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 #[crate_type = "rlib"];