Expand the DocAddress struct with named fields

src/query/boolean_query/boolean_query.rs

@@ -238,9 +238,9 @@ mod tests {
         assert_eq!(
             docs,
             vec![
-                DocAddress(0u32, 1u32),
-                DocAddress(0u32, 2u32),
-                DocAddress(0u32, 3u32)
+                DocAddress::new(0u32, 1u32),
+                DocAddress::new(0u32, 2u32),
+                DocAddress::new(0u32, 3u32)
             ]
             .into_iter()
             .collect()
@@ -264,15 +264,24 @@ mod tests {
             BooleanQuery::intersection(vec![term_b.box_clone(), term_c.box_clone()]);
         {
             let docs = searcher.search(&intersection_ab, &DocSetCollector)?;
-            assert_eq!(docs, vec![DocAddress(0u32, 2u32)].into_iter().collect());
+            assert_eq!(
+                docs,
+                vec![DocAddress::new(0u32, 2u32)].into_iter().collect()
+            );
         }
         {
             let docs = searcher.search(&intersection_ac, &DocSetCollector)?;
-            assert_eq!(docs, vec![DocAddress(0u32, 1u32)].into_iter().collect());
+            assert_eq!(
+                docs,
+                vec![DocAddress::new(0u32, 1u32)].into_iter().collect()
+            );
         }
         {
             let docs = searcher.search(&intersection_bc, &DocSetCollector)?;
-            assert_eq!(docs, vec![DocAddress(0u32, 0u32)].into_iter().collect());
+            assert_eq!(
+                docs,
+                vec![DocAddress::new(0u32, 0u32)].into_iter().collect()
+            );
         }
         Ok(())
     }

src/query/boolean_query/mod.rs

@@ -128,7 +128,7 @@ mod tests {
                 .docs()
                 .iter()
                 .cloned()
-                .map(|doc| doc.1)
+                .map(|doc| doc.doc_id)
                 .collect::<Vec<DocId>>()
         };
         {
@@ -196,8 +196,8 @@ mod tests {
             let topdocs_no_excluded = matching_topdocs(&boolean_query_no_excluded);
             assert_eq!(topdocs_no_excluded.len(), 2);
             let (top_score, top_doc) = topdocs_no_excluded[0];
-            assert_eq!(top_doc, DocAddress(0, 4));
-            assert_eq!(topdocs_no_excluded[1].1, DocAddress(0, 3)); // ignore score of doc 3.
+            assert_eq!(top_doc, DocAddress::new(0, 4));
+            assert_eq!(topdocs_no_excluded[1].1, DocAddress::new(0, 3)); // ignore score of doc 3.
             score_doc_4 = top_score;
         }
 
@@ -210,7 +210,7 @@ mod tests {
             let topdocs_excluded = matching_topdocs(&boolean_query_two_excluded);
             assert_eq!(topdocs_excluded.len(), 1);
             let (top_score, top_doc) = topdocs_excluded[0];
-            assert_eq!(top_doc, DocAddress(0, 4));
+            assert_eq!(top_doc, DocAddress::new(0, 4));
             assert_eq!(top_score, score_doc_4);
         }
     }
@@ -309,7 +309,7 @@ mod tests {
             IndexRecordOption::Basic,
         ));
         let query = BooleanQuery::from(vec![(Occur::Should, term_a), (Occur::Should, term_b)]);
-        let explanation = query.explain(&searcher, DocAddress(0, 0u32))?;
+        let explanation = query.explain(&searcher, DocAddress::new(0, 0u32))?;
         assert_nearly_equals!(explanation.value(), 0.6931472);
         Ok(())
     }