change this to only emit a warning right now

Paul Woolcock · Paul Woolcock · commit 1b9949161b95 · 2016-12-06T15:51:06.000-05:00
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
@@ -546,7 +546,7 @@ impl TomlManifest {
         }
 
         // processing the custom build script
-        let new_build = self.maybe_custom_build(&project.build, &layout.root);
+        let new_build = self.maybe_custom_build(&project.build, &layout.root, &mut warnings);
 
         // Get targets
         let targets = normalize(&lib,
@@ -774,7 +774,10 @@ impl TomlManifest {
         Ok(replace)
     }
 
-    fn maybe_custom_build(&self, build: &Option<StringOrBool>, project_dir: &Path)
+    fn maybe_custom_build(&self,
+                          build: &Option<StringOrBool>,
+                          project_dir: &Path,
+                          warnings: &mut Vec<String>)
                           -> Option<PathBuf> {
         let build_rs = project_dir.join("build.rs");
         match *build {
@@ -783,7 +786,15 @@ impl TomlManifest {
             Some(StringOrBool::String(ref s)) => Some(PathBuf::from(s)),
             None => {
                 match fs::metadata(&build_rs) {
-                    Ok(ref e) if e.is_file() => Some(build_rs.into()),
+                    // Enable this after the warning has been visible for some time
+                    // Ok(ref e) if e.is_file() => Some(build_rs.into()),
+                    Ok(ref e) if e.is_file() => {
+                        warnings.push("`build.rs` files in the same directory \
+                                       as your `Cargo.toml` will soon be treated \
+                                       as build scripts. Add `build = false` to \
+                                       your `Cargo.toml` to prevent this".into());
+                        None
+                    },
                     Ok(_) => None,
                     Err(_) => None,
                 }
diff --git a/tests/build-script.rs b/tests/build-script.rs
@@ -2345,8 +2345,12 @@ fn assume_build_script_when_build_rs_present() {
             authors = []
         "#)
         .file("src/main.rs", r#"
+            use std::path::Path;
             fn main() {
-                println!(include_str!(concat!(env!("OUT_DIR"), "/output")));
+                let f = env!("OUT_DIR");
+                assert!(
+                    ! Path::new(f).join("output").exists()
+                );
             }
         "#)
         .file("build.rs", r#"
@@ -2365,7 +2369,14 @@ fn assume_build_script_when_build_rs_present() {
     p.build();
 
     assert_that(p.cargo("run").arg("-v"),
-                execs().with_status(0).with_stdout("foo\n"));
+                execs().with_status(0).with_stderr("\
+warning: `build.rs` files in the same directory as your `Cargo.toml` will soon be treated \
+as build scripts. Add `build = false` to your `Cargo.toml` to prevent this
+   Compiling builder v0.0.1 ([..])
+     Running [..]
+    Finished [..]
+     Running [..]
+"));
 }
 
 #[test]
