From: bors <bors@rust-lang.org>
Date: Thu, 12 Jan 2017 04:03:27 +0000 (+0000)
Subject: Auto merge of #3490 - alexcrichton:dev-dep-doc-test, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5eb9072cc3b2149e250ea99aaa2c64f0c0486797;p=cargo.git

Auto merge of #3490 - alexcrichton:dev-dep-doc-test, r=brson

Fix cargo test --doc with dev-deps

Previously Cargo accidentally didn't pull in dev-dependencies due to the way
`cargo test --doc` was interpreted in terms of top-level targets. This PR
special cases this situation by ensuring that the doctest intention makes its
way all to the backend and the dependencies can be correctly calculated.

Closes #3422
---

5eb9072cc3b2149e250ea99aaa2c64f0c0486797
diff --cc src/cargo/ops/cargo_rustc/mod.rs
index 4bcf363df,0c9ea9dec..162f98509
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@@ -11,8 -11,9 +11,9 @@@ use rustc_serialize::json
  use core::{Package, PackageId, PackageSet, Target, Resolve};
  use core::{Profile, Profiles, Workspace};
  use core::shell::ColorConfig;
 -use util::{self, CargoResult, ProcessBuilder, human, machine_message};
 +use util::{self, CargoResult, ProcessBuilder, ProcessError, human, machine_message};
  use util::{Config, internal, ChainError, profile, join_paths, short_hash};
+ use util::Freshness;
  
  use self::job::{Job, Work};
  use self::job_queue::JobQueue;