Fixed the bogus dev-dependencies pull in on regular build

fixes rust-lang#1796

src/cargo/ops/cargo_compile.rs

@@ -149,7 +149,8 @@ pub fn compile_pkg<'a>(package: &Package,
         let platform = target.as_ref().map(|e| &e[..]).or(Some(&rustc_host[..]));
 
         let method = Method::Required{
-            dev_deps: true, // TODO: remove this option?
+            dev_deps: options.mode == CompileMode::Test ||
+                options.mode == CompileMode::Bench,
             features: &features,
             uses_default_features: !no_default_features,
             target_platform: platform};

tests/test_cargo_features.rs

@@ -741,3 +741,42 @@ test!(unions_work_with_no_default_features {
     assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
     assert_that(p.cargo("build"), execs().with_status(0).with_stdout(""));
 });
+
+test!(dev_dependencies_doesnt_leak_features {
+    let p = project("foo")
+        .file("Cargo.toml", r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            authors = []
+
+            [dependencies.a]
+            path = "a"
+
+            [dev-dependencies.a]
+            path = "a"
+            features = ["badfeature"]
+        "#)
+        .file("src/lib.rs", r#"
+            extern crate a;
+            pub fn foo() { a::a(); }
+        "#)
+        .file("a/Cargo.toml", r#"
+            [package]
+            name = "a"
+            version = "0.1.0"
+            authors = []
+
+            [features]
+            badfeature = []
+        "#)
+        .file("a/src/lib.rs", r#"
+            #[cfg(feature = "badfeature")]
+            pub fn a() { panic!(); }
+
+            #[cfg(not(feature = "badfeature"))]
+            pub fn a() { }
+        "#);
+
+    assert_that(p.cargo("run"), execs().with_status(0));
+});