From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 16 Dec 2016 08:17:02 +0000 (+0300)
Subject: Rename resolve_dependencies -> resolve_ws_precisely
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~74^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7211de3dbe3569e95db17b00c2b3dde28fb0373;p=cargo.git

Rename resolve_dependencies -> resolve_ws_precisely
---

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index b2027b991..1be87408a 100644
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -141,7 +141,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
     let profiles = ws.profiles();
 
     let specs = spec.into_package_id_specs(ws)?;
-    let resolve = ops::resolve_dependencies(ws,
+    let resolve = ops::resolve_ws_precisely(ws,
                                             source,
                                             features,
                                             all_features,
diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs
index 673e753bc..e86a4de41 100644
--- a/src/cargo/ops/cargo_output_metadata.rs
+++ b/src/cargo/ops/cargo_output_metadata.rs
@@ -44,7 +44,7 @@ fn metadata_no_deps(ws: &Workspace,
 fn metadata_full(ws: &Workspace,
                  opt: &OutputMetadataOptions) -> CargoResult<ExportInfo> {
     let specs = Packages::All.into_package_id_specs(ws)?;
-    let deps = ops::resolve_dependencies(ws,
+    let deps = ops::resolve_ws_precisely(ws,
                                          None,
                                          &opt.features,
                                          opt.all_features,
diff --git a/src/cargo/ops/mod.rs b/src/cargo/ops/mod.rs
index b727456b6..865b74094 100644
--- a/src/cargo/ops/mod.rs
+++ b/src/cargo/ops/mod.rs
@@ -20,7 +20,7 @@ pub use self::registry::{registry_login, search, http_proxy_exists, http_handle}
 pub use self::registry::{modify_owners, yank, OwnersOptions, PublishOpts};
 pub use self::cargo_fetch::fetch;
 pub use self::cargo_pkgid::pkgid;
-pub use self::resolve::{resolve_ws, resolve_dependencies, resolve_with_previous};
+pub use self::resolve::{resolve_ws, resolve_ws_precisely, resolve_with_previous};
 pub use self::cargo_output_metadata::{output_metadata, OutputMetadataOptions, ExportInfo};
 
 mod cargo_clean;
diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs
index 1c1b21ca4..b1f33a2d2 100644
--- a/src/cargo/ops/resolve.rs
+++ b/src/cargo/ops/resolve.rs
@@ -7,7 +7,7 @@ use sources::PathSource;
 use ops;
 use util::{profile, human, CargoResult, ChainError};
 
-/// Resolve all dependencies for the specified `package` using the previous
+/// Resolve all dependencies for the workspace using the previous
 /// lockfile as a guide if present.
 ///
 /// This function will also write the result of resolution as a new
@@ -19,7 +19,9 @@ pub fn resolve_ws<'a>(ws: &Workspace<'a>) -> CargoResult<(PackageSet<'a>, Resolv
     Ok((packages, resolve))
 }
 
-pub fn resolve_dependencies<'a>(ws: &Workspace<'a>,
+/// Resolves dependencies for some packages of the workspace,
+/// taking into account `paths` overrides and activated features.
+pub fn resolve_ws_precisely<'a>(ws: &Workspace<'a>,
                                 source: Option<Box<Source + 'a>>,
                                 features: &[String],
                                 all_features: bool,