dv: add krate field to MergeHashKaniList

Author: zjp-CN

src/bin/verify_rust_std/merge.rs

@@ -5,7 +5,7 @@ use distributed_verification::{
     diff::{KaniListJson, MergeHashKaniList},
     logger,
 };
-use std::collections::HashMap;
+use std::{collections::HashMap, path::PathBuf};
 
 pub fn run(args: &[String]) -> Result<()> {
     logger::init();
@@ -17,7 +17,7 @@ pub fn run(args: &[String]) -> Result<()> {
 struct SubCmdMerge {
     /// Path to hash json file which is generated by distributed-verification.
     #[arg(long)]
-    hash_json: String,
+    hash_json: PathBuf,
 
     /// Strip file path prefix in hash json.
     #[arg(long, default_value_t)]
@@ -36,7 +36,9 @@ impl SubCmdMerge {
     fn run(self) -> Result<()> {
         debug!(?self);
 
-        let mut hash_json: Vec<SerFunction> = crate::read_json(&self.hash_json)?;
+        // NOTE: extract crate_name from crate_name.json, since we don't store crate_name in data.
+        let crate_name = self.hash_json.file_stem().unwrap().to_str().unwrap();
+        let mut hash_json: Vec<SerFunction> = crate::read_json(self.hash_json.to_str().unwrap())?;
 
         let mut kani_list: KaniListJson = crate::read_json(&self.kani_list)?;
         // normalize paths like core/src/../../portable-simd/crates/core_simd/src/masks.rs
@@ -63,6 +65,7 @@ impl SubCmdMerge {
                 None => (None, None),
             };
             v_merge.push(MergeHashKaniList {
+                krate: crate_name.into(),
                 file: file.into(),
                 func: func.into(),
                 hash,

src/diff.rs

@@ -249,6 +249,8 @@ impl MergedHarnesses<'_> {
 /// Merge hash json and kani-list.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct MergeHashKaniList {
+    #[serde(rename = "crate")]
+    pub krate: Box<str>,
     pub file: Box<str>,
     pub func: Box<str>,
     #[serde(skip_serializing_if = "Option::is_none")]