Merge pull request #305 from smoelius/build-dir

Proposed `-Zbuild-dir` fix

Author: oli-obk

tests/selftest.rs

@@ -84,11 +84,13 @@ fn builder_interface() {
 
 #[test]
 fn error1() {
+    let manifest_path = current_dir().unwrap().join("foo");
+    let error = "error: the manifest-path must be a path to a Cargo.toml file";
+    let error_with_path = format!("{error}: `{}`", manifest_path.display());
     match MetadataCommand::new().manifest_path("foo").exec() {
-        Err(Error::CargoMetadata { stderr }) => assert_eq!(
-            stderr.trim(),
-            "error: the manifest-path must be a path to a Cargo.toml file"
-        ),
+        Err(Error::CargoMetadata { stderr }) => {
+            assert!([error, &error_with_path].contains(&stderr.trim()))
+        }
         _ => unreachable!(),
     }
 }
@@ -181,23 +183,11 @@ fn workspace_default_packages() {
 #[test]
 #[cfg(feature = "unstable")]
 fn build_dir() {
-    let metadata = MetadataCommand::new()
-        .no_deps()
-        .other_options(["-Zbuild-dir"].map(str::to_string))
-        .exec()
-        .unwrap();
+    let metadata = MetadataCommand::new().no_deps().exec().unwrap();
 
     assert!(&metadata.build_directory.is_some());
     assert!(&metadata
         .build_directory
         .unwrap()
         .ends_with("cargo_metadata/target"));
 }
-
-#[test]
-#[cfg(feature = "unstable")]
-fn build_dir_disabled() {
-    let metadata = MetadataCommand::new().no_deps().exec().unwrap();
-
-    assert!(&metadata.build_directory.is_none());
-}