Rename pkgid to crate_id

Closes #11035

diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index 5ada1bfa63046bbfd75e23285ab22bac0cb8e150..ce788f06c38dae9eb623a695754286035962faf0 100755 (executable)
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -44,6 +44,7 @@ i = 0
 c.write(
 """
 // AUTO-GENERATED FILE: DO NOT EDIT
+#[crate_id=\"run_pass_stage2#0.1\"];
 #[pkgid=\"run_pass_stage2#0.1\"];
 #[link(name=\"run_pass_stage2\", vers=\"0.1\")];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];

diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index 8e739809b8787bae7d61fe5c02602d3d33280515..82ca4d65b233ec41738b9522e9e328031c157137 100644 (file)
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -20,7 +20,9 @@
 
 */
 
+// NOTE: remove after snapshot
 #[pkgid = "extra#0.9-pre"];
+#[crate_id = "extra#0.9-pre"];
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index c5be6776eef117583855f96e9fc62840bb13becd..f0bff76685fe6e4652307bda905c22ae4173f550 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -8,7 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// NOTE: remove after snapshot
 #[pkgid = "rustc#0.9-pre"];
+#[crate_id = "rustc#0.9-pre"];
 #[comment = "The Rust compiler"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];

diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index b27aa11651d4a1400f27cce9e43dc9f1e4e5417b..8d8c246f2cad00a9b2da5d19d86a549f41224595 100644 (file)
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -1499,13 +1499,13 @@ fn synthesize_pkgid_attr(ecx: &EncodeContext) -> Attribute {
 
         attr::mk_attr(
             attr::mk_name_value_item_str(
-                @"pkgid",
+                @"crate_id",
                 ecx.link_meta.pkgid.to_str().to_managed()))
     }
 
     let mut attrs = ~[];
     for attr in crate.attrs.iter() {
-        if "pkgid" != attr.name()  {
+        if "crate_id" != attr.name()  {
             attrs.push(*attr);
         }
     }

diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
index 8f5ae723c54b221cb5e6a5045157d9fa878a59bc..bdf4c550378feed04692b3484f5ce744f6beba70 100644 (file)
--- a/src/librustc/middle/lint.rs
+++ b/src/librustc/middle/lint.rs
@@ -832,7 +832,8 @@ fn check_heap_item(cx: &Context, it: &ast::item) {
 }
 
 static crate_attrs: &'static [&'static str] = &[
-    "crate_type", "feature", "no_uv", "no_main", "no_std", "pkgid",
+// NOTE: remove pkgid after snapshot
+    "crate_type", "feature", "no_uv", "no_main", "no_std", "pkgid", "crate_id",
     "desc", "comment", "license", "copyright", // not used in rustc now
 ];
 

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 0727c04f44e3634173b17e29e3249c96383d0d09..3645161ee1cea871b0abd6595ebe586fb89802e5 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -8,7 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// NOTE: remove after snapshot
 #[pkgid = "rustdoc#0.9-pre"];
+#[crate_id = "rustdoc#0.9-pre"];
 #[desc = "rustdoc, the Rust documentation extractor"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];

diff --git a/src/librustpkg/lib.rs b/src/librustpkg/lib.rs
index 14c5966aabd519c928979227c85eb9f191554ac7..9dbddf7881872d650c485bec6735b99ee9492e73 100644 (file)
--- a/src/librustpkg/lib.rs
+++ b/src/librustpkg/lib.rs
@@ -10,7 +10,9 @@
 
 // rustpkg - a package manager and build system for Rust
 
+// NOTE: remove after snapshot
 #[pkgid = "rustpkg#0.9-pre"];
+#[crate_id = "rustpkg#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 

diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs
index 28bf8deb5a7d9b8e4afc848084e6acc4213986d5..ecf08df5f185a9732992dde8f9287bd9a395550e 100644 (file)
--- a/src/librustpkg/tests.rs
+++ b/src/librustpkg/tests.rs
@@ -1892,9 +1892,9 @@ fn pkgid_pointing_to_subdir() {
     fs::mkdir_recursive(&foo_dir, io::UserRWX);
     fs::mkdir_recursive(&bar_dir, io::UserRWX);
     writeFile(&foo_dir.join("lib.rs"),
-              "#[pkgid=\"mockgithub.com/mozilla/some_repo/extras/foo\"]; pub fn f() {}");
+              "#[crate_id=\"mockgithub.com/mozilla/some_repo/extras/foo\"]; pub fn f() {}");
     writeFile(&bar_dir.join("lib.rs"),
-              "#[pkgid=\"mockgithub.com/mozilla/some_repo/extras/bar\"]; pub fn g() {}");
+              "#[crate_id=\"mockgithub.com/mozilla/some_repo/extras/bar\"]; pub fn g() {}");
 
     debug!("Creating a file in {}", workspace.display());
     let testpkg_dir = workspace.join_many(["src", "testpkg-0.0"]);
@@ -2316,7 +2316,7 @@ fn find_sources_in_cwd() {
     let source_dir = temp_dir.join("foo");
     fs::mkdir_recursive(&source_dir, io::UserRWX);
     writeFile(&source_dir.join("main.rs"),
-              "fn main() { let _x = (); }");
+              r#"#[crate_id="foo"]; fn main() { let _x = (); }"#);
     command_line_test([~"install", ~"foo"], &source_dir);
     assert_executable_exists(&source_dir.join(".rust"), "foo");
 }

diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 296021204bfbe4fd53511bcbc38805ca022b718d..7a68ae8b15ca4caba70056fb2bca13c356575cbb 100644 (file)
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -291,10 +291,10 @@ pub fn compile_input(context: &BuildContext,
                                   });
 
     // Inject the pkgid attribute so we get the right package name and version
-    if !attr::contains_name(crate.attrs, "pkgid") {
+    if !attr::contains_name(crate.attrs, "crate_id") {
         // FIXME (#9639): This needs to handle non-utf8 paths
         let pkgid_attr =
-            attr::mk_name_value_item_str(@"pkgid",
+            attr::mk_name_value_item_str(@"crate_id",
                                          format!("{}\\#{}",
                                                  pkg_id.path.as_str().unwrap(),
                                                  pkg_id.version.to_str()).to_managed());

diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs
index 9f2b19ac5fd6901d99390aa1bd1c9e4317c44510..2e5b7254769f136afdae9a6f7117feaa39d2ef95 100644 (file)
--- a/src/librustuv/lib.rs
+++ b/src/librustuv/lib.rs
@@ -34,7 +34,9 @@
 
 */
 
+// NOTE: remove after snapshot
 #[pkgid = "rustuv#0.9-pre"];
+#[crate_id = "rustuv#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 53e26e435b7df7eeef1ad53eaab8f655322a0e32..b2b856c5c83c8c6c6ceb63808c74ae594357c803 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -43,7 +43,9 @@
 //!
 //!     use std::prelude::*;
 
+// NOTE: remove after snapshot
 #[pkgid = "std#0.9-pre"];
+#[crate_id = "std#0.9-pre"];
 #[comment = "The Rust standard library"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];

diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index ac5254f1abafc80f02dce3b0ee98ee1eb201b57b..5e16213190cadf962f1ef5a909f2422f3a70f0f5 100644 (file)
--- 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 9599f27af04c8d6d810ae84d3818671d1625c860..25986f67c6908bc97bcf5f234f5860aa892d2704 100644 (file)
--- 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"];

diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
index 0c1906500c07fc9ebb2ac1fd5a3d8d2d136a4059..aa6ee35a077925027e494cabdfb9c3364adf67d0 100644 (file)
--- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="anonexternmod#0.1"];
+#[crate_id="anonexternmod#0.1"];
 
 use std::libc;
 

diff --git a/src/test/auxiliary/cci_impl_lib.rs b/src/test/auxiliary/cci_impl_lib.rs
index 16c03fa8e3b330d5816e8ae75ab66657297c9785..1f5c98cd7e1c78295421d40dfc7a41977c52df13 100644 (file)
--- a/src/test/auxiliary/cci_impl_lib.rs
+++ b/src/test/auxiliary/cci_impl_lib.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="cci_impl_lib"];
+#[crate_id="cci_impl_lib"];
 // NOTE: remove after the next snapshot
 #[link(name="cci_impl_lib", vers="0.0")];
 

diff --git a/src/test/auxiliary/cci_iter_lib.rs b/src/test/auxiliary/cci_iter_lib.rs
index 903563055b7f1efbbeeaf5b5003735dde025c90a..672d06f1ccba3cfe5eb7c54c63ddef444fcd2840 100644 (file)
--- a/src/test/auxiliary/cci_iter_lib.rs
+++ b/src/test/auxiliary/cci_iter_lib.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="cci_iter_lib"];
+#[crate_id="cci_iter_lib"];
 // NOTE: remove after the next snapshot
 #[link(name="cci_iter_lib", vers="0.0")];
 

diff --git a/src/test/auxiliary/cci_no_inline_lib.rs b/src/test/auxiliary/cci_no_inline_lib.rs
index ea06cbf793a4defe787d5c0d23486455c7eeab39..ef832d8e443f5c2dc3e26b052a5a7f2a463be535 100644 (file)
--- a/src/test/auxiliary/cci_no_inline_lib.rs
+++ b/src/test/auxiliary/cci_no_inline_lib.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="cci_no_inline_lib"];
+#[crate_id="cci_no_inline_lib"];
 // NOTE: remove after the next snapshot
 #[link(name="cci_no_inline_lib", vers="0.0")];
 

diff --git a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
index 921082440d86be3f043b1e1132f5ecbcd13c0044..a5e10eaaf6872664ee0f13cb6c10ddb423bb9d44 100644 (file)
--- a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
+++ b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[feature(managed_boxes)];
-#[pkgid="crate_method_reexport_grrrrrrr2"];
+#[crate_id="crate_method_reexport_grrrrrrr2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crate_method_reexport_grrrrrrr2")];
 

diff --git a/src/test/auxiliary/crateresolve1-1.rs b/src/test/auxiliary/crateresolve1-1.rs
index d7600f95ecdb187b95dd13893f0a5dab06b2e680..1188626242b64b1bc2c7b5290bff6a6c5d6ae99f 100644 (file)
--- a/src/test/auxiliary/crateresolve1-1.rs
+++ b/src/test/auxiliary/crateresolve1-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve1#0.1"];
+#[crate_id="crateresolve1#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve1",
        vers = "0.1")];

diff --git a/src/test/auxiliary/crateresolve1-2.rs b/src/test/auxiliary/crateresolve1-2.rs
index 239d11b19857732af853e3112a8d5247109f4caa..f0d69b3eaafa143800c5f9ec8c2bda635e4a5f81 100644 (file)
--- a/src/test/auxiliary/crateresolve1-2.rs
+++ b/src/test/auxiliary/crateresolve1-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve1#0.2"];
+#[crate_id="crateresolve1#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve1",
        vers = "0.2")];

diff --git a/src/test/auxiliary/crateresolve1-3.rs b/src/test/auxiliary/crateresolve1-3.rs
index 7acb3804fd307533a44ecd991bd3c1f682043294..fe62de2d409a33007dbfaa93571e579e6a065740 100644 (file)
--- a/src/test/auxiliary/crateresolve1-3.rs
+++ b/src/test/auxiliary/crateresolve1-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve1#0.3"];
+#[crate_id="crateresolve1#0.3"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve1",
        vers = "0.3")];

diff --git a/src/test/auxiliary/crateresolve2-1.rs b/src/test/auxiliary/crateresolve2-1.rs
index 149314e5a07442fb9415f8d1a88042677a6689f6..7d64c24798bdd8c9b4dfc07d0c50c0655134bca9 100644 (file)
--- a/src/test/auxiliary/crateresolve2-1.rs
+++ b/src/test/auxiliary/crateresolve2-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve2#0.1"];
+#[crate_id="crateresolve2#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve2",
        vers = "0.1")];

diff --git a/src/test/auxiliary/crateresolve2-2.rs b/src/test/auxiliary/crateresolve2-2.rs
index 9286b68586a9854697319d154448b982659cd968..bd7fb7cfa815271649f731bf945f21e3434a9102 100644 (file)
--- a/src/test/auxiliary/crateresolve2-2.rs
+++ b/src/test/auxiliary/crateresolve2-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve2#0.2"];
+#[crate_id="crateresolve2#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve2",
        vers = "0.2")];

diff --git a/src/test/auxiliary/crateresolve2-3.rs b/src/test/auxiliary/crateresolve2-3.rs
index 37ccbbd40d70e0673aa67de0515d739169cac14a..64aeca48608b64fb621ced5f265b75fd7650e079 100644 (file)
--- a/src/test/auxiliary/crateresolve2-3.rs
+++ b/src/test/auxiliary/crateresolve2-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve2#0.3"];
+#[crate_id="crateresolve2#0.3"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve2",
        vers = "0.3")];

diff --git a/src/test/auxiliary/crateresolve3-1.rs b/src/test/auxiliary/crateresolve3-1.rs
index e2c46a9a88d2f7c974868afb95704625e2cac6fa..ae6fe53ab479372e3c00eee163d92c983e8895b4 100644 (file)
--- a/src/test/auxiliary/crateresolve3-1.rs
+++ b/src/test/auxiliary/crateresolve3-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve3#0.1"];
+#[crate_id="crateresolve3#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve3",
        vers = "0.1")];

diff --git a/src/test/auxiliary/crateresolve3-2.rs b/src/test/auxiliary/crateresolve3-2.rs
index cda986f21cbf6ea246f4b14d49cd886a5e5be610..b77e147c6355685a3e15db9b797f8f0133042b92 100644 (file)
--- a/src/test/auxiliary/crateresolve3-2.rs
+++ b/src/test/auxiliary/crateresolve3-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve3#0.2"];
+#[crate_id="crateresolve3#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve3",
        vers = "0.2")];

diff --git a/src/test/auxiliary/crateresolve4a-1.rs b/src/test/auxiliary/crateresolve4a-1.rs
index eeb946b1da7715c1d17e9f42a075e216642a0c9f..683a46ceecd7b9f3b8e14509107c73dba3313a86 100644 (file)
--- a/src/test/auxiliary/crateresolve4a-1.rs
+++ b/src/test/auxiliary/crateresolve4a-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve4a#0.1"];
+#[crate_id="crateresolve4a#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve4a", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/crateresolve4a-2.rs b/src/test/auxiliary/crateresolve4a-2.rs
index 9c089fd214139ee9f094c838214ca6ce8a340a8e..6facf02d923b0a5e82bf057fada99db78a97651a 100644 (file)
--- a/src/test/auxiliary/crateresolve4a-2.rs
+++ b/src/test/auxiliary/crateresolve4a-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve4a#0.2"];
+#[crate_id="crateresolve4a#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve4a", vers= "0.2")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/crateresolve4b-1.rs b/src/test/auxiliary/crateresolve4b-1.rs
index 9fbfdcf1687d1702cb3a9d567c6a16c97a5628e8..e19cd6c73d2011442d1dbe2ffd15c9081facd80b 100644 (file)
--- a/src/test/auxiliary/crateresolve4b-1.rs
+++ b/src/test/auxiliary/crateresolve4b-1.rs
@@ -10,7 +10,7 @@
 
 // aux-build:crateresolve4a-1.rs
 // aux-build:crateresolve4a-2.rs
-#[pkgid="crateresolve4b#0.1"];
+#[crate_id="crateresolve4b#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve4b", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/crateresolve4b-2.rs b/src/test/auxiliary/crateresolve4b-2.rs
index 73484ab22320158ee2dff07d6a0ed99b80ee86a1..2c00d9aab8d991effb1388a054852d9fdee29555 100644 (file)
--- a/src/test/auxiliary/crateresolve4b-2.rs
+++ b/src/test/auxiliary/crateresolve4b-2.rs
@@ -10,7 +10,7 @@
 
 // aux-build:crateresolve4a-1.rs
 // aux-build:crateresolve4a-2.rs
-#[pkgid="crateresolve4b#0.2"];
+#[crate_id="crateresolve4b#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve4b", vers = "0.2")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/crateresolve5-1.rs b/src/test/auxiliary/crateresolve5-1.rs
index 726b3919f7ff33e5d04248eddcb5576e1d7469ac..f619499f4f44284f9c72f6a5fb80fd4503408128 100644 (file)
--- a/src/test/auxiliary/crateresolve5-1.rs
+++ b/src/test/auxiliary/crateresolve5-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve5#0.1"];
+#[crate_id="crateresolve5#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve5",
        vers = "0.1")];

diff --git a/src/test/auxiliary/crateresolve5-2.rs b/src/test/auxiliary/crateresolve5-2.rs
index 05a760dea7384ab03878fa41d640fd1d5dd02420..d0164d77e6652bd218100d1f011e863cab346b18 100644 (file)
--- a/src/test/auxiliary/crateresolve5-2.rs
+++ b/src/test/auxiliary/crateresolve5-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve5#0.2"];
+#[crate_id="crateresolve5#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve5",
        vers = "0.2")];

diff --git a/src/test/auxiliary/crateresolve8-1.rs b/src/test/auxiliary/crateresolve8-1.rs
index b0990d2e3036dfd8b31a7b36767d889ab05868b9..aa3babea58f269ca187f083d64685e56fa952b22 100644 (file)
--- a/src/test/auxiliary/crateresolve8-1.rs
+++ b/src/test/auxiliary/crateresolve8-1.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // default link meta for 'package_id' will be equal to filestem
-#[pkgid="crateresolve8#0.1"];
+#[crate_id="crateresolve8#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve8",
        vers = "0.1")];

diff --git a/src/test/auxiliary/crateresolve_calories-1.rs b/src/test/auxiliary/crateresolve_calories-1.rs
index 0f000716e4de04bd2818bde7109ea591abbcd8a6..39328f28beace641cb5708c6ef7db8c8f14a5951 100644 (file)
--- a/src/test/auxiliary/crateresolve_calories-1.rs
+++ b/src/test/auxiliary/crateresolve_calories-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve_calories#0.1"];
+#[crate_id="crateresolve_calories#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve_calories",
        vers = "0.1",

diff --git a/src/test/auxiliary/crateresolve_calories-2.rs b/src/test/auxiliary/crateresolve_calories-2.rs
index 4d3ff1e2071aba4ce35cf1e0f8c6e922738514c0..edf90589db799b29af612050e8ce30a5b925dc7b 100644 (file)
--- a/src/test/auxiliary/crateresolve_calories-2.rs
+++ b/src/test/auxiliary/crateresolve_calories-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="crateresolve_calories#0.1"];
+#[crate_id="crateresolve_calories#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "crateresolve_calories",
        vers = "0.1",

diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern-crosscrate-source.rs
index d6bf2dda9cedf8d91eabd8bbae5ec3288533f95e..7a7d0c453a71e9c60f1d28fd1bc7376781aadfeb 100644 (file)
--- a/src/test/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/auxiliary/extern-crosscrate-source.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="externcallback#0.1"];
+#[crate_id="externcallback#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "externcallback",
        vers = "0.1")];

diff --git a/src/test/auxiliary/foreign_lib.rs b/src/test/auxiliary/foreign_lib.rs
index 4a92a8dd5666c60bf58be86d5b42b38aef0911ce..bc2ef7262a6fa7d78dcd3e5814a778c30ff6bb64 100644 (file)
--- a/src/test/auxiliary/foreign_lib.rs
+++ b/src/test/auxiliary/foreign_lib.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="foreign_lib"];
+#[crate_id="foreign_lib"];
 // NOTE: remove after the next snapshot
 #[link(name="foreign_lib", vers="0.0")];
 

diff --git a/src/test/auxiliary/inline_dtor.rs b/src/test/auxiliary/inline_dtor.rs
index 67db37234cf003cd5ae1edcabdbb46c5fb9c7885..83f2cee0a5435a362cc0df6767fc2455524d1005 100644 (file)
--- a/src/test/auxiliary/inline_dtor.rs
+++ b/src/test/auxiliary/inline_dtor.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="inline_dtor#0.1"];
+#[crate_id="inline_dtor#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name="inline_dtor", vers="0.1")];
 

diff --git a/src/test/auxiliary/iss.rs b/src/test/auxiliary/iss.rs
index 6be7d7ab214d323d1a6a53a2abe6723e330066ac..b7cffa4c37828d35dd4a37382c9e5a70fc6e8598 100644 (file)
--- a/src/test/auxiliary/iss.rs
+++ b/src/test/auxiliary/iss.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="issue6919_3#0.1"];
+#[crate_id="issue6919_3#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name="iss6919_3", vers="0.1")];
 

diff --git a/src/test/auxiliary/issue-2380.rs b/src/test/auxiliary/issue-2380.rs
index a1534aa25e44ee693ff1c6c220c2b8e106ab1052..24c8edbc80078c18d157a78e4e194607bc4235fe 100644 (file)
--- a/src/test/auxiliary/issue-2380.rs
+++ b/src/test/auxiliary/issue-2380.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[feature(managed_boxes)];
-#[pkgid="a"];
+#[crate_id="a"];
 // NOTE: remove after the next snapshot
 #[link(name = "a", vers = "0.0")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue-2414-a.rs b/src/test/auxiliary/issue-2414-a.rs
index 9caf89deb492692ee0436e6a53d218168f01925d..c9779a0040d78842216b43d45fa093435b887027 100644 (file)
--- a/src/test/auxiliary/issue-2414-a.rs
+++ b/src/test/auxiliary/issue-2414-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="a#0.1"];
+#[crate_id="a#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "a", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue-2414-b.rs b/src/test/auxiliary/issue-2414-b.rs
index 726f8cc29ab3073cc4826884b4225ee8afc39d51..33cb5d5fb6c4b630437700100b42c347d1b77639 100644 (file)
--- a/src/test/auxiliary/issue-2414-b.rs
+++ b/src/test/auxiliary/issue-2414-b.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-#[pkgid="b#0.1"];
+#[crate_id="b#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "b", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs
index cdbb081f9022eae9a1c56571cd4f153363b6624b..5948a4923053bfb1798667d92d04f42e2e4f448a 100644 (file)
--- a/src/test/auxiliary/issue-2526.rs
+++ b/src/test/auxiliary/issue-2526.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="issue_2526#0.2"];
+#[crate_id="issue_2526#0.2"];
 // NOTE: remove after the next snapshot
 #[link(name = "issue_2526",
        vers = "0.2",

diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs
index 451fde61ce7ef75ad534335133ba688045a0716d..e5457e46d33dcce8804046daf72f08aac3b16ac2 100644 (file)
--- a/src/test/auxiliary/issue-2631-a.rs
+++ b/src/test/auxiliary/issue-2631-a.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[feature(managed_boxes)];
-#[pkgid="req"];
+#[crate_id="req"];
 // NOTE: remove after the next snapshot
 #[link(name = "req")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue-3012-1.rs b/src/test/auxiliary/issue-3012-1.rs
index f206911a7c06f1320a55f970ad30a8ee85bfa778..40ae334ef72272e18a03c945cbd0f4fa9ac8b3b4 100644 (file)
--- a/src/test/auxiliary/issue-3012-1.rs
+++ b/src/test/auxiliary/issue-3012-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="socketlib"];
+#[crate_id="socketlib"];
 // NOTE: remove after the next snapshot
 #[link(name="socketlib", vers="0.0")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue-4208-cc.rs b/src/test/auxiliary/issue-4208-cc.rs
index 35b19c6558c467b061cf86047625f1f7cd42c197..71db81459b0dcfb2fd28e23980750a965028d09d 100644 (file)
--- a/src/test/auxiliary/issue-4208-cc.rs
+++ b/src/test/auxiliary/issue-4208-cc.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="numeric#0.1"];
+#[crate_id="numeric#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "numeric",
        vers = "0.1")];

diff --git a/src/test/auxiliary/issue_2242_a.rs b/src/test/auxiliary/issue_2242_a.rs
index cfa75be5b0eb283c96a70948e458cbc96ad6cc8f..4d21abe64efe1b918583728321c94bdd705a55a8 100644 (file)
--- a/src/test/auxiliary/issue_2242_a.rs
+++ b/src/test/auxiliary/issue_2242_a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="a#0.1"];
+#[crate_id="a#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "a", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue_2242_c.rs b/src/test/auxiliary/issue_2242_c.rs
index 331d25358931447f852b003b6456fe67a285ea3f..60054cd22189ac7b7ef582284aa0c6a77c796810 100644 (file)
--- a/src/test/auxiliary/issue_2242_c.rs
+++ b/src/test/auxiliary/issue_2242_c.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="c#0.1"];
+#[crate_id="c#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "c", vers = "0.1")];
 #[crate_type = "lib"];

diff --git a/src/test/auxiliary/issue_3979_traits.rs b/src/test/auxiliary/issue_3979_traits.rs
index e800e59b9978237f419330c2d022010de2440fd6..08f83d9d2062408262db948e65631b36081fac0c 100644 (file)
--- a/src/test/auxiliary/issue_3979_traits.rs
+++ b/src/test/auxiliary/issue_3979_traits.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="issue_3979_traits#0.1"];
+#[crate_id="issue_3979_traits#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "issue_3979_traits",
        vers = "0.1")];

diff --git a/src/test/auxiliary/lint_stability.rs b/src/test/auxiliary/lint_stability.rs
index 398d0268bc57efed9a9cf8cb368fff01cd5ccfec..8b821c656228a145adf9484f5b4f590100aae9b0 100644 (file)
--- a/src/test/auxiliary/lint_stability.rs
+++ b/src/test/auxiliary/lint_stability.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#[pkgid="lint_stability#0.1"];
+#[crate_id="lint_stability#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "lint_stability",
        vers = "0.1")];

diff --git a/src/test/auxiliary/static-function-pointer-aux.rs b/src/test/auxiliary/static-function-pointer-aux.rs
index b80ac427dc21d635407c30de0acb37a27ae4a871..b257f4578a5ff20e0bfc6a5dd7546ae67cfb8b0c 100644 (file)
--- a/src/test/auxiliary/static-function-pointer-aux.rs
+++ b/src/test/auxiliary/static-function-pointer-aux.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="static-function-pointer-aux"];
+#[crate_id="static-function-pointer-aux"];
 
 pub fn f(x: int) -> int { -x }
 

diff --git a/src/test/auxiliary/static-methods-crate.rs b/src/test/auxiliary/static-methods-crate.rs
index c6f27ebb97189a7803435b5b55bdd5ee1414d9bb..648c9ca7320fe828a1dd413dcdc75db70fa592ca 100644 (file)
--- a/src/test/auxiliary/static-methods-crate.rs
+++ b/src/test/auxiliary/static-methods-crate.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="static_methods_crate#0.1"];
+#[crate_id="static_methods_crate#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "static_methods_crate",
        vers = "0.1")];

diff --git a/src/test/auxiliary/struct_variant_xc_aux.rs b/src/test/auxiliary/struct_variant_xc_aux.rs
index a090b052016fc712b87f9b5c2a733a06590e0b3f..fc258a8a52794c57cdd292ddd2ddd0c14f59e1a8 100644 (file)
--- a/src/test/auxiliary/struct_variant_xc_aux.rs
+++ b/src/test/auxiliary/struct_variant_xc_aux.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="struct_variant_xc_aux#0.1"];
+#[crate_id="struct_variant_xc_aux#0.1"];
 // NOTE: remove after the next snapshot
 #[link(name = "struct_variant_xc_aux",
        vers = "0.1")];

diff --git a/src/test/auxiliary/trait_default_method_xc_aux.rs b/src/test/auxiliary/trait_default_method_xc_aux.rs
index a0b50f860ddc166ad16d0599221096fef385b561..9ed45da9e17abe89ccd4035d768ce56d25e1ca5d 100644 (file)
--- a/src/test/auxiliary/trait_default_method_xc_aux.rs
+++ b/src/test/auxiliary/trait_default_method_xc_aux.rs
@@ -1,4 +1,4 @@
-#[pkgid="trait_default_method_xc_aux"];
+#[crate_id="trait_default_method_xc_aux"];
 
 pub struct Something { x: int }
 

diff --git a/src/test/run-make/bootstrap-from-c-with-uvio/lib.rs b/src/test/run-make/bootstrap-from-c-with-uvio/lib.rs
index e42382fa84c2a2f782cfbf4b9f4d9996ea19fd54..06a06c967f4fb0044f233612494aa6d713a3a262 100644 (file)
--- a/src/test/run-make/bootstrap-from-c-with-uvio/lib.rs
+++ b/src/test/run-make/bootstrap-from-c-with-uvio/lib.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="boot#0.1"];
+#[crate_id="boot#0.1"];
 #[crate_type="lib"];
 
 extern mod rustuv; // pull in uvio

diff --git a/src/test/run-make/dep-info/lib.rs b/src/test/run-make/dep-info/lib.rs
index d08a0fbcb6079bc7cb88f887e851a238bed9e0dd..937118269a7473e7edd5bf16dbc27367e323bb69 100644 (file)
--- a/src/test/run-make/dep-info/lib.rs
+++ b/src/test/run-make/dep-info/lib.rs
@@ -1,4 +1,4 @@
-#[pkgid="foo#0.1"];
+#[crate_id="foo#0.1"];
 
 pub mod foo;
 pub mod bar;

diff --git a/src/test/run-pass/crateresolve8.rs b/src/test/run-pass/crateresolve8.rs
index ad716edd5ef05a4ca4eb6f237b74a7a9b8d9cb30..1dd1b9c098b62813441aa9fd6e3590dee9549654 100644 (file)
--- a/src/test/run-pass/crateresolve8.rs
+++ b/src/test/run-pass/crateresolve8.rs
@@ -11,7 +11,7 @@
 // xfail-fast
 // aux-build:crateresolve8-1.rs
 
-#[pkgid="crateresolve8#0.1"];
+#[crate_id="crateresolve8#0.1"];
 
 extern mod crateresolve8(vers = "0.1", package_id="crateresolve8#0.1");
 //extern mod crateresolve8(vers = "0.1");

diff --git a/src/test/run-pass/issue-1251.rs b/src/test/run-pass/issue-1251.rs
index 7fb897f9f202001ad0f00798386b62017c050e3f..27ea0d394b883b08c0c8bc5b3d7cf6a8740b8f08 100644 (file)
--- a/src/test/run-pass/issue-1251.rs
+++ b/src/test/run-pass/issue-1251.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="rust_get_test_int"];
+#[crate_id="rust_get_test_int"];
 // NOTE: remove after the next snapshot
 #[link(name = "rust_get_test_int")];
 

diff --git a/src/test/run-pass/issue-6919.rs b/src/test/run-pass/issue-6919.rs
index 041c0609dcd9e619a99aae01d3d83cc8cf1b2473..8482af9e7c4a84baf863be255871bc86e1add2df 100644 (file)
--- a/src/test/run-pass/issue-6919.rs
+++ b/src/test/run-pass/issue-6919.rs
@@ -11,7 +11,7 @@
 // aux-build:iss.rs
 // xfail-fast
 
-#[pkgid="issue-6919"];
+#[crate_id="issue-6919"];
 
 extern mod issue6919_3;
 

diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs
index 99ada9cc650d577760b988a596aa8817101d0192..b453dca1800c621e500dbf81963d16a94d8f5b70 100644 (file)
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/run-pass/item-attributes.rs
@@ -16,7 +16,7 @@
 #[attr3];
 #[attr4(attr5)];
 
-#[pkgid="extra#0.1"];
+#[crate_id="extra#0.1"];
 // NOTE: remove after the next snapshot
 // Special linkage attributes for the crate
 #[link(name = "extra",