Merge pull request rust-osdev#69 from rust-osdev/fix-doctests

phil-opp · web-flow · commit 495a2c176ccf · 2020-12-10T16:35:46.000+01:00
Fix nightly breakage of doctests in workspaces
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Fix nightly breakage of doctests in workspaces ([#69](https://github.com/rust-osdev/bootimage/pull/69))
+
 # 0.10.1 – 2020-08-03
 
 - Parse `--version` argument without subcommand (`bootimage --version`) ([#67](https://github.com/rust-osdev/bootimage/pull/67))
diff --git a/src/builder/mod.rs b/src/builder/mod.rs
@@ -26,7 +26,18 @@ impl Builder {
     ///
     /// If None is passed for `manifest_path`, it is automatically searched.
     pub fn new(manifest_path: Option<PathBuf>) -> Result<Self, BuilderError> {
-        let manifest_path = manifest_path.unwrap_or(locate_cargo_manifest::locate_manifest()?);
+        let manifest_path = match manifest_path.or_else(|| {
+            std::env::var("CARGO_MANIFEST_DIR")
+                .ok()
+                .map(|dir| Path::new(&dir).join("Cargo.toml"))
+        }) {
+            Some(path) => path,
+            None => {
+                println!("WARNING: `CARGO_MANIFEST_DIR` env variable not set");
+                locate_cargo_manifest::locate_manifest()?
+            }
+        };
+
         Ok(Builder {
             manifest_path,
             project_metadata: None,
