refactor(fingerprint): rename to RustdocFingerprint

Author: weihanglo

src/cargo/core/compiler/build_runner/mod.rs

@@ -16,15 +16,14 @@ use filetime::FileTime;
 use itertools::Itertools;
 use jobserver::Client;
 
+use super::RustdocFingerprint;
 use super::custom_build::{self, BuildDeps, BuildScriptOutputs, BuildScripts};
 use super::fingerprint::{Checksum, Fingerprint};
 use super::job_queue::JobQueue;
 use super::layout::Layout;
 use super::lto::Lto;
 use super::unit_graph::UnitDep;
-use super::{
-    BuildContext, Compilation, CompileKind, CompileMode, Executor, FileFlavor, RustDocFingerprint,
-};
+use super::{BuildContext, Compilation, CompileKind, CompileMode, Executor, FileFlavor};
 
 mod compilation_files;
 use self::compilation_files::CompilationFiles;
@@ -178,7 +177,7 @@ impl<'a, 'gctx> BuildRunner<'a, 'gctx> {
         // they were compiled with the same Rustc version that we're currently using.
         // See the function doc comment for more.
         if self.bcx.build_config.intent.is_doc() {
-            RustDocFingerprint::check_rustdoc_fingerprint(&self)?
+            RustdocFingerprint::check_rustdoc_fingerprint(&self)?
         }
 
         for unit in &self.bcx.roots {

src/cargo/core/compiler/fingerprint/mod.rs

@@ -410,7 +410,7 @@ pub use self::dep_info::parse_dep_info;
 pub use self::dep_info::parse_rustc_dep_info;
 pub use self::dep_info::translate_dep_info;
 pub use self::dirty_reason::DirtyReason;
-pub use self::rustdoc::RustDocFingerprint;
+pub use self::rustdoc::RustdocFingerprint;
 
 /// Determines if a [`Unit`] is up-to-date, and if not prepares necessary work to
 /// update the persisted fingerprint.

src/cargo/core/compiler/fingerprint/rustdoc.rs

@@ -21,12 +21,12 @@ use crate::core::compiler::CompileKind;
 /// they were compiled with the same Rustc version that we're currently using.
 /// Otherwise we must remove the `doc/` folder and compile again forcing a rebuild.
 #[derive(Debug, Serialize, Deserialize)]
-pub struct RustDocFingerprint {
+pub struct RustdocFingerprint {
     /// `rustc -vV` verbose version output.
     pub rustc_vv: String,
 }
 
-impl RustDocFingerprint {
+impl RustdocFingerprint {
     /// Checks whether the latest version of rustc used to compile this workspace's docs
     /// was the same as the one is currently being used in this `cargo doc` call.
     ///
@@ -51,7 +51,7 @@ impl RustDocFingerprint {
         {
             return Ok(());
         }
-        let new_fingerprint = RustDocFingerprint {
+        let new_fingerprint = RustdocFingerprint {
             rustc_vv: build_runner.bcx.rustc().verbose_version.clone(),
         };
 
@@ -66,7 +66,7 @@ impl RustDocFingerprint {
 /// Checks rustdoc fingerprint file for a given [`CompileKind`].
 fn check_fingerprint(
     build_runner: &BuildRunner<'_, '_>,
-    new_fingerprint: &RustDocFingerprint,
+    new_fingerprint: &RustdocFingerprint,
     kind: CompileKind,
 ) -> CargoResult<()> {
     let fingerprint_path = build_runner
@@ -88,7 +88,7 @@ fn check_fingerprint(
         return write_fingerprint();
     };
 
-    match serde_json::from_str::<RustDocFingerprint>(&rustdoc_data) {
+    match serde_json::from_str::<RustdocFingerprint>(&rustdoc_data) {
         Ok(on_disk_fingerprint) => {
             if on_disk_fingerprint.rustc_vv == new_fingerprint.rustc_vv {
                 return Ok(());

src/cargo/core/compiler/mod.rs

@@ -84,7 +84,7 @@ pub use self::crate_type::CrateType;
 pub use self::custom_build::LinkArgTarget;
 pub use self::custom_build::{BuildOutput, BuildScriptOutputs, BuildScripts, LibraryPath};
 pub(crate) use self::fingerprint::DirtyReason;
-pub use self::fingerprint::RustDocFingerprint;
+pub use self::fingerprint::RustdocFingerprint;
 pub use self::job_queue::Freshness;
 use self::job_queue::{Job, JobQueue, JobState, Work};
 pub(crate) use self::layout::Layout;

tests/testsuite/doc.rs

@@ -5,7 +5,8 @@ use std::str;
 
 use crate::prelude::*;
 use crate::utils::tools;
-use cargo::core::compiler::RustDocFingerprint;
+
+use cargo::core::compiler::RustdocFingerprint;
 use cargo_test_support::registry::Package;
 use cargo_test_support::str;
 use cargo_test_support::{basic_lib_manifest, basic_manifest, git, project};
@@ -2495,7 +2496,7 @@ LLVM version: 9.0
 
     dummy_project.cargo("doc").run();
 
-    let fingerprint: RustDocFingerprint =
+    let fingerprint: RustdocFingerprint =
         serde_json::from_str(&dummy_project.read_file("target/.rustdoc_fingerprint.json"))
             .expect("JSON Serde fail");
 
@@ -2534,7 +2535,7 @@ LLVM version: 9.0
 
     assert!(!dummy_project.build_dir().join("doc/bogus_file").exists());
 
-    let fingerprint: RustDocFingerprint =
+    let fingerprint: RustdocFingerprint =
         serde_json::from_str(&dummy_project.read_file("target/.rustdoc_fingerprint.json"))
             .expect("JSON Serde fail");
 
@@ -2582,11 +2583,11 @@ LLVM version: 9.0
 
     let target_fingerprint_path = p.build_dir().join(host).join(".rustdoc_fingerprint.json");
 
-    let host_fingerprint: RustDocFingerprint =
+    let host_fingerprint: RustdocFingerprint =
         serde_json::from_str(&fs::read_to_string(&host_fingerprint_path).unwrap())
             .expect("JSON Serde fail");
 
-    let target_fingerprint: RustDocFingerprint =
+    let target_fingerprint: RustdocFingerprint =
         serde_json::from_str(&fs::read_to_string(&target_fingerprint_path).unwrap())
             .expect("JSON Serde fail");
 
@@ -2630,7 +2631,7 @@ LLVM version: 9.0
 
     // target doc dir got cleaned
     assert!(!p.build_dir().join(host).join("doc/bogus_file").exists());
-    let fingerprint: RustDocFingerprint =
+    let fingerprint: RustdocFingerprint =
         serde_json::from_str(&fs::read_to_string(&target_fingerprint_path).unwrap()).unwrap();
     assert_eq!(&fingerprint.rustc_vv, &current_rustc_version);
 }