Move 'source_ids_from_config' function into 'resolve' module

src/cargo/ops/cargo_compile.rs

@@ -29,12 +29,12 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use core::registry::PackageRegistry;
-use core::{Source, SourceId, PackageSet, Package, Target, PackageId};
+use core::{Source, PackageSet, Package, Target, PackageId};
 use core::resolver::Method;
 use ops::{self, BuildOutput, ExecEngine};
 use sources::{PathSource};
-use util::config::{ConfigValue, Config};
-use util::{CargoResult, internal, human, ChainError, profile};
+use util::config::Config;
+use util::{CargoResult, human, ChainError, profile};
 
 /// Contains informations about how a package should be compiled.
 pub struct CompileOptions<'a, 'b: 'a> {
@@ -91,7 +91,8 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions)
         return Err(human("jobs must be at least 1"))
     }
 
-    let override_ids = try!(source_ids_from_config(config, package.root()));
+    let override_ids = try!(ops::source_ids_from_config(config,
+                                                        package.get_root()));
 
     let (packages, resolve_with_overrides, sources) = {
         let rustc_host = config.rustc_host().to_string();
@@ -160,31 +161,6 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions)
     return Ok(ret);
 }
 
-fn source_ids_from_config(config: &Config, cur_path: &Path)
-                          -> CargoResult<Vec<SourceId>> {
-
-    let configs = try!(config.values());
-    debug!("loaded config; configs={:?}", configs);
-    let config_paths = match configs.get("paths") {
-        Some(cfg) => cfg,
-        None => return Ok(Vec::new())
-    };
-    let paths = try!(config_paths.list().chain_error(|| {
-        internal("invalid configuration for the key `paths`")
-    }));
-
-    paths.iter().map(|&(ref s, ref p)| {
-        // The path listed next to the string is the config file in which the
-        // key was located, so we want to pop off the `.cargo/config` component
-        // to get the directory containing the `.cargo` folder.
-        p.parent().unwrap().parent().unwrap().join(s)
-    }).filter(|p| {
-        // Make sure we don't override the local package, even if it's in the
-        // list of override paths.
-        cur_path != &**p
-    }).map(|p| SourceId::for_path(&p)).collect()
-}
-
 fn scrape_build_config(config: &Config,
                        jobs: Option<u32>,
                        target: Option<String>) -> CargoResult<ops::BuildConfig> {

src/cargo/ops/mod.rs

@@ -21,7 +21,8 @@ pub use self::registry::{registry_login, search, http_proxy_exists, http_handle}
 pub use self::registry::{modify_owners, yank, OwnersOptions};
 pub use self::cargo_fetch::{fetch};
 pub use self::cargo_pkgid::pkgid;
-pub use self::resolve::{resolve_pkg, resolve_with_previous};
+pub use self::resolve::{resolve_pkg, resolve_with_previous, source_ids_from_config};
+pub use self::cargo_output_dependencies::{output_dependencies, OutputTo, OutputOptions};
 
 mod cargo_clean;
 mod cargo_compile;

src/cargo/ops/resolve.rs

@@ -4,7 +4,8 @@ use core::{Package, PackageId, SourceId};
 use core::registry::PackageRegistry;
 use core::resolver::{self, Resolve, Method};
 use ops;
-use util::CargoResult;
+use util::{CargoResult, ChainError, internal};
+use util::config::Config;
 
 /// Resolve all dependencies for the specified `package` using the previous
 /// lockfile as a guide if present.
@@ -122,3 +123,26 @@ pub fn resolve_with_previous<'a>(registry: &mut PackageRegistry,
         }
     }
 }
+
+pub fn source_ids_from_config(config: &Config, cur_path: Path) -> CargoResult<Vec<SourceId>> {
+    let configs = try!(config.values());
+    debug!("loaded config; configs={:?}", configs);
+    let config_paths = match configs.get("paths") {
+        Some(cfg) => cfg,
+        None => return Ok(Vec::new())
+    };
+    let paths = try!(config_paths.list().chain_error(|| {
+        internal("invalid configuration for the key `paths`")
+    }));
+
+    paths.iter().map(|&(ref s, ref p)| {
+        // The path listed next to the string is the config file in which the
+        // key was located, so we want to pop off the `.cargo/config` component
+        // to get the directory containing the `.cargo` folder.
+        p.dir_path().dir_path().join(s.as_slice())
+    }).filter(|p| {
+        // Make sure we don't override the local package, even if it's in the
+        // list of override paths.
+        cur_path != *p
+    }).map(|p| SourceId::for_path(&p)).collect()
+}