Create dirs if needed before f_p write call

Once `RustDocFingerprint::check_rustdoc_fingerprint()` is
executed it might happen that the `doc/` dir is removed.

This means that when we call `fingerprint.write()` we need
to create the `doc` directory again.

Author: CPerezz

src/cargo/core/compiler/build_context/target_info.rs

@@ -776,6 +776,8 @@ impl RustDocFingerprint {
 
     /// Write the `RustDocFingerprint` info into the fingerprint file.
     pub fn write(&self, doc_dir: &Path) -> std::io::Result<()> {
+        crate::util::paths::create_dir_all(doc_dir)
+            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, format!("{:?}", e)))?;
         let rustdoc_fingerprint_file =
             File::create(RustDocFingerprint::path_to_fingerprint(doc_dir))?;
         // We write the actual `Rustc` version to it so that we just need to compile it straight

src/cargo/core/compiler/mod.rs

@@ -32,9 +32,7 @@ use lazycell::LazyCell;
 use log::debug;
 
 pub use self::build_config::{BuildConfig, CompileMode, MessageFormat};
-pub use self::build_context::{
-    BuildContext, FileFlavor, FileType, RustDocFingerprint, RustcTargetData, TargetInfo,
-};
+pub use self::build_context::{BuildContext, FileFlavor, FileType, TargetInfo};
 use self::build_plan::BuildPlan;
 pub use self::compilation::{Compilation, Doctest};
 pub use self::compile_kind::{CompileKind, CompileTarget};
@@ -598,7 +596,7 @@ fn rustdoc(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Work> {
     // it doesn't already exist.
     paths::create_dir_all(&doc_dir)?;
 
-    rustdoc.arg("-o").arg(doc_dir.clone());
+    rustdoc.arg("-o").arg(doc_dir);
 
     for feat in &unit.features {
         rustdoc.arg("--cfg").arg(&format!("feature=\"{}\"", feat));
@@ -651,7 +649,6 @@ fn rustdoc(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Work> {
                 false,
             )
             .chain_err(|| format!("could not document `{}`", name))?;
-
         Ok(())
     }))
 }

tests/testsuite/doc.rs

@@ -1607,11 +1607,6 @@ fn crate_versions() {
 
 #[cargo_test]
 fn crate_versions_flag_is_overridden() {
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct RustDocFingerprint {
-        rustc_verbose_version: String,
-    }
-
     let p = project()
         .file(
             "Cargo.toml",
@@ -1674,11 +1669,11 @@ LLVM version: 9.0
         .file(
             "Cargo.toml",
             r#"
-                    [package]
-                    name = "foo"
-                    version = "1.2.4"
-                    authors = []
-                "#,
+            [package]
+            name = "foo"
+            version = "1.2.4"
+            authors = []
+        "#,
         )
         .file("src/lib.rs", "//! These are the docs!")
         .build();
@@ -1786,73 +1781,3 @@ LLVM version: 9.0
         (String::from_utf8_lossy(&output.stdout).as_ref())
     );
 }
-
-#[cargo_test]
-fn doc_test_in_workspace() {
-    let p = project()
-        .file(
-            "Cargo.toml",
-            r#"
-                [workspace]
-                members = [
-                    "crate-a",
-                    "crate-b",
-                ]
-            "#,
-        )
-        .file(
-            "crate-a/Cargo.toml",
-            r#"
-                [project]
-                name = "crate-a"
-                version = "0.1.0"
-            "#,
-        )
-        .file(
-            "crate-a/src/lib.rs",
-            "\
-                //! ```
-                //! assert_eq!(1, 1);
-                //! ```
-            ",
-        )
-        .file(
-            "crate-b/Cargo.toml",
-            r#"
-                [project]
-                name = "crate-b"
-                version = "0.1.0"
-            "#,
-        )
-        .file(
-            "crate-b/src/lib.rs",
-            "\
-                //! ```
-                //! assert_eq!(1, 1);
-                //! ```
-            ",
-        )
-        .build();
-    p.cargo("test --doc -vv")
-        .with_stderr_contains("[DOCTEST] crate-a")
-        .with_stdout_contains(
-            "
-running 1 test
-test crate-a/src/lib.rs - (line 1) ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
-
-",
-        )
-        .with_stderr_contains("[DOCTEST] crate-b")
-        .with_stdout_contains(
-            "
-running 1 test
-test crate-b/src/lib.rs - (line 1) ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
-
-",
-        )
-        .run();
-}