Rename uses of PkgId to CrateId in librustpkg

Author: luisbg

src/etc/combine-tests.py

@@ -45,7 +45,7 @@ def scrub(b):
 """
 // AUTO-GENERATED FILE: DO NOT EDIT
 #[crate_id=\"run_pass_stage2#0.1\"];
-#[pkgid=\"run_pass_stage2#0.1\"];
+#[crate_id=\"run_pass_stage2#0.1\"];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];
 #[allow(warnings)];
 """

src/librustpkg/api.rs

@@ -10,7 +10,7 @@
 
 use context::*;
 use crate::*;
-use package_id::*;
+use crate_id::*;
 use package_source::*;
 use path_util::{platform_library_name, target_build_dir};
 use target::*;
@@ -92,7 +92,7 @@ pub fn build_lib_with_cfgs(sysroot: Path, root: Path, name: ~str,
         build_in_destination: false,
         destination_workspace: root.clone(),
         start_dir: root.join_many(["src", name.as_slice()]),
-        id: PkgId{ version: version, ..PkgId::new(name)},
+        id: CrateId{ version: version, ..CrateId::new(name)},
         // n.b. This assumes the package only has one crate
         libs: ~[mk_crate(lib)],
         mains: ~[],
@@ -115,7 +115,7 @@ pub fn build_exe_with_cfgs(sysroot: Path, root: Path, name: ~str,
         build_in_destination: false,
         destination_workspace: root.clone(),
         start_dir: root.join_many(["src", name.as_slice()]),
-        id: PkgId{ version: version, ..PkgId::new(name)},
+        id: CrateId{ version: version, ..CrateId::new(name)},
         libs: ~[],
         // n.b. This assumes the package only has one crate
         mains: ~[mk_crate(main)],
@@ -132,8 +132,8 @@ pub fn install_pkg(cx: &BuildContext,
                    version: Version,
                    // For now, these inputs are assumed to be inputs to each of the crates
                    more_inputs: ~[(~str, Path)]) { // pairs of Kind and Path
-    let pkgid = PkgId{ version: version, ..PkgId::new(name)};
-    cx.install(PkgSrc::new(workspace.clone(), workspace, false, pkgid),
+    let crateid = CrateId{ version: version, ..CrateId::new(name)};
+    cx.install(PkgSrc::new(workspace.clone(), workspace, false, crateid),
                &WhatToBuild{ build_type: Inferred,
                              inputs_to_discover: more_inputs,
                              sources: Everything });
@@ -157,10 +157,10 @@ pub fn build_library_in_workspace(exec: &mut workcache::Exec,
     let out_name = workspace_build_dir.join_many([package_name.to_str(),
                                                   platform_library_name(output)]);
     // make paths absolute
-    let pkgid = PkgId::new(package_name);
+    let crateid = CrateId::new(package_name);
     let absolute_paths = paths.map(|s| {
             let whatever = workspace.join_many([~"src",
-                                pkgid.to_str(),
+                                crateid.to_str(),
                                 s.to_owned()]);
             whatever.as_str().unwrap().to_owned()
         });
@@ -190,8 +190,8 @@ pub fn my_workspace(context: &Context, package_name: &str) -> Path {
     use bad_pkg_id     = conditions::bad_pkg_id::cond;
 
     // (this assumes no particular version is requested)
-    let pkgid = PkgId::new(package_name);
-    let workspaces = pkg_parent_workspaces(context, &pkgid);
+    let crateid = CrateId::new(package_name);
+    let workspaces = pkg_parent_workspaces(context, &crateid);
     if workspaces.is_empty() {
         bad_pkg_id.raise((Path::new(package_name), package_name.to_owned()));
     }

src/librustpkg/conditions.rs

@@ -10,7 +10,7 @@
 
 // Useful conditions
 
-pub use package_id::PkgId;
+pub use crate_id::CrateId;
 pub use std::io::FileStat;
 pub use std::io::process::ProcessExit;
 pub use std::path::Path;
@@ -20,15 +20,15 @@ condition! {
 }
 
 condition! {
-    pub nonexistent_package: (PkgId, ~str) -> Path;
+    pub nonexistent_package: (CrateId, ~str) -> Path;
 }
 
 condition! {
-    pub missing_pkg_files: (PkgId) -> ();
+    pub missing_pkg_files: (CrateId) -> ();
 }
 
 condition! {
-    pub bad_pkg_id: (Path, ~str) -> PkgId;
+    pub bad_pkg_id: (Path, ~str) -> CrateId;
 }
 
 condition! {

src/librustpkg/package_id.rs renamed to src/librustpkg/crate_id.rs

@@ -17,7 +17,7 @@ use std::hash;
 /// 'github.com/graydon/test'; path must be a relative
 /// path with >=1 component.
 #[deriving(Clone)]
-pub struct PkgId {
+pub struct CrateId {
     /// This is a path, on the local filesystem, referring to where the
     /// files for this package live. For example:
     /// github.com/mozilla/quux-whatever (it's assumed that if we're
@@ -35,14 +35,14 @@ pub struct PkgId {
     version: Version
 }
 
-impl Eq for PkgId {
-    fn eq(&self, other: &PkgId) -> bool {
+impl Eq for CrateId {
+    fn eq(&self, other: &CrateId) -> bool {
         self.path == other.path && self.version == other.version
     }
 }
 
-impl PkgId {
-    pub fn new(s: &str) -> PkgId {
+impl CrateId {
+    pub fn new(s: &str) -> CrateId {
         use conditions::bad_pkg_id::cond;
 
         let mut given_version = None;
@@ -60,10 +60,10 @@ impl PkgId {
 
         let path = Path::new(s);
         if !path.is_relative() {
-            return cond.raise((path, ~"absolute pkgid"));
+            return cond.raise((path, ~"absolute crate_id"));
         }
         if path.filename().is_none() {
-            return cond.raise((path, ~"0-length pkgid"));
+            return cond.raise((path, ~"0-length crate_id"));
         }
         let short_name = path.filestem_str().expect(format!("Strange path! {}", s));
 
@@ -78,7 +78,7 @@ impl PkgId {
             }
         };
 
-        PkgId {
+        CrateId {
             path: path.clone(),
             short_name: short_name.to_owned(),
             version: version
@@ -142,7 +142,7 @@ impl Iterator<(Path, Path)> for Prefixes {
     }
 }
 
-impl ToStr for PkgId {
+impl ToStr for CrateId {
     fn to_str(&self) -> ~str {
         // should probably use the filestem and not the whole path
         format!("{}-{}", self.path.as_str().unwrap(), self.version.to_str())

src/librustpkg/installed_packages.rs

@@ -16,7 +16,7 @@ use std::os;
 use std::io;
 use std::io::fs;
 
-pub fn list_installed_packages(f: |&PkgId| -> bool) -> bool  {
+pub fn list_installed_packages(f: |&CrateId| -> bool) -> bool  {
     let workspaces = rust_path();
     for p in workspaces.iter() {
         let binfiles = {
@@ -28,7 +28,7 @@ pub fn list_installed_packages(f: |&PkgId| -> bool) -> bool  {
             match exec.filestem_str() {
                 None => (),
                 Some(exec_path) => {
-                    if !f(&PkgId::new(exec_path)) {
+                    if !f(&CrateId::new(exec_path)) {
                         return false;
                     }
                 }
@@ -50,7 +50,7 @@ pub fn list_installed_packages(f: |&PkgId| -> bool) -> bool  {
                     let rel_path = rel_p.join(basename);
                     rel_path.display().with_str(|s| {
                         debug!("Rel name: {}", s);
-                        f(&PkgId::new(s));
+                        f(&CrateId::new(s));
                     });
                 }
                 None => ()
@@ -78,7 +78,7 @@ pub fn has_library(p: &Path) -> Option<~str> {
     None
 }
 
-pub fn package_is_installed(p: &PkgId) -> bool {
+pub fn package_is_installed(p: &CrateId) -> bool {
     let mut is_installed = false;
     list_installed_packages(|installed| {
         if installed == p {