Auto merge of #3664 - pwoolcoc:issue-3391, r=alexcrichton

bors · bors · commit ce9ddf3480f3 · 2017-02-07T20:08:02.000Z
Assume that a `build.rs` file is a build script If cargo sees a `build.rs` file in the same directory as the current `Cargo.toml`, it will assume that the `build.rs` file is a build script, unless there is `build = false` in the `Cargo.toml` file. Closes #3391
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
@@ -534,7 +534,7 @@ impl TomlManifest {
         }
 
         // processing the custom build script
-        let new_build = self.maybe_custom_build(&project.build, &layout.root, &mut warnings);
+        let new_build = self.maybe_custom_build(&project.build, &layout.root);
 
         // Get targets
         let targets = normalize(&layout.root,
@@ -768,8 +768,7 @@ impl TomlManifest {
 
     fn maybe_custom_build(&self,
                           build: &Option<StringOrBool>,
-                          project_dir: &Path,
-                          warnings: &mut Vec<String>)
+                          project_dir: &Path)
                           -> Option<PathBuf> {
         let build_rs = project_dir.join("build.rs");
         match *build {
@@ -778,15 +777,9 @@ impl TomlManifest {
             Some(StringOrBool::String(ref s)) => Some(PathBuf::from(s)),
             None => {
                 match fs::metadata(&build_rs) {
-                    // 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
-                    },
+                    // If there is a build.rs file next to the Cargo.toml, assume it is
+                    // a build script
+                    Ok(ref e) if e.is_file() => Some(build_rs.into()),
                     Ok(_) => None,
                     Err(_) => None,
                 }
diff --git a/tests/build-script.rs b/tests/build-script.rs
@@ -2350,8 +2350,8 @@ fn assume_build_script_when_build_rs_present() {
         "#)
         .file("src/main.rs", r#"
             fn main() {
-                if cfg!(foo) {
-                    panic!("the build script was run");
+                if ! cfg!(foo) {
+                    panic!("the build script was not run");
                 }
             }
         "#)
@@ -2363,14 +2363,7 @@ fn assume_build_script_when_build_rs_present() {
     p.build();
 
     assert_that(p.cargo("run").arg("-v"),
-                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 [..]
-"));
+                execs().with_status(0));
 }
 
 #[test]
