Cleanup debug statements

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index c11cbcfdf35b54ce82dce09ec908df1fb6aee541..afd36b826a8dcf4842cffff4a94d5ab03940903d 100755 (executable)
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -25,7 +25,7 @@ use super::layout::Layout;
 use super::links::Links;
 use super::{Kind, Compilation, BuildConfig};
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash)]
 pub struct Unit<'a> {
     pub pkg: &'a Package,
     pub target: &'a Target,
@@ -485,7 +485,6 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
 
         // Mix in the target-metadata of all the dependencies of this target
         if let Ok(deps) = self.used_deps(unit) {
-            debug!("Mixing in units {:?} to {:?}:{:?}", deps.len(), unit.target.name(), unit.target.kind());
             let mut deps_metadata = deps.into_iter().map(|dep_unit| {
                 self.target_metadata(&dep_unit)
             }).collect::<Vec<_>>();
@@ -518,9 +517,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
             channel.hash(&mut hasher);
         }
 
-        let x = Metadata(hasher.finish());
-        debug!("Produced hash {} for {:?}:{:?}", x, unit.target.name(), unit.target.kind());
-        Some(x)
+        Some(Metadata(hasher.finish()))
     }
 
     /// Returns the file stem for a given target/profile combo (with metadata)

diff --git a/tests/workspaces.rs b/tests/workspaces.rs
index 2e7660d16c51f71c3c23c90bddce3d1a4c4e5912..d7eabcf7a524e07ec1b6594dc7e6d54e15653d1c 100644 (file)
--- a/tests/workspaces.rs
+++ b/tests/workspaces.rs
@@ -1530,6 +1530,8 @@ fn dep_used_with_separate_features() {
 
     // Build caller1. should build the dep library. Because the features
     // are different than the full workspace, it rebuilds.
+    // Ideally once we solve https://github.com/rust-lang/cargo/issues/3620, then
+    // a single cargo build at the top level will be enough.
     assert_that(p.cargo("build").cwd(p.root().join("caller1")),
                 execs().with_status(0)
                        .with_stderr("\