diff --git a/master/src/tantivy/query/union.rs.html b/master/src/tantivy/query/union.rs.html index 13dc95f13..363006001 100644 --- a/master/src/tantivy/query/union.rs.html +++ b/master/src/tantivy/query/union.rs.html @@ -472,6 +472,14 @@ 416 417 418 +419 +420 +421 +422 +423 +424 +425 +426 
 use docset::{DocSet, SkipResult};
 use query::Scorer;
@@ -584,7 +592,9 @@
     }
 }
 
-impl<TScorer: Scorer, TScoreCombiner: ScoreCombiner> DocSet for Union<TScorer, TScoreCombiner> {
+impl<TScorer, TScoreCombiner> DocSet for Union<TScorer, TScoreCombiner>
+    where TScorer: Scorer, TScoreCombiner: ScoreCombiner
+{
     fn advance(&mut self) -> bool {
         if self.advance_buffered() {
             return true;
@@ -727,7 +737,6 @@
     use query::score_combiner::DoNothingCombiner;
 
     fn aux_test_union(vals: Vec<Vec<u32>>) {
-        use std::collections::BTreeSet;
         let mut val_set: BTreeSet<u32> = BTreeSet::new();
         for vs in &vals {
             for &v in vs {
@@ -736,17 +745,24 @@
         }
         let union_vals: Vec<u32> = val_set.into_iter().collect();
         let mut union_expected = VecDocSet::from(union_vals);
-        let mut union: Union<_, DoNothingCombiner> = Union::from(
-            vals.into_iter()
-                .map(VecDocSet::from)
-                .map(ConstScorer::new)
-                .collect::<Vec<ConstScorer<VecDocSet>>>(),
-        );
+        let make_union = || {
+            Union::from(
+                vals.iter()
+                    .cloned()
+                    .map(VecDocSet::from)
+                    .map(ConstScorer::new)
+                    .collect::<Vec<ConstScorer<VecDocSet>>>(),
+            )
+        };
+        let mut union: Union<_, DoNothingCombiner> = make_union();
+        let mut count = 0;
         while union.advance() {
             assert!(union_expected.advance());
             assert_eq!(union_expected.doc(), union.doc());
+            count += 1;
         }
         assert!(!union_expected.advance());
+        assert_eq!(count, make_union().count());
     }
 
     #[test]
diff --git a/master/tantivy/query/struct.Union.html b/master/tantivy/query/struct.Union.html
index a833fabee..c300fe8c8 100644
--- a/master/tantivy/query/struct.Union.html
+++ b/master/tantivy/query/struct.Union.html
@@ -68,16 +68,16 @@
         
impl<TScorer, TScoreCombiner> From<Vec<TScorer>> for Union<TScorer, TScoreCombiner> where
    TScoreCombiner: ScoreCombiner,
    TScorer: Scorer, 
[src]

 
[src]

 
Performs the conversion.

-
impl<TScorer: Scorer, TScoreCombiner: ScoreCombiner> DocSet for Union<TScorer, TScoreCombiner>
[src]

-
[src]

+
impl<TScorer, TScoreCombiner> DocSet for Union<TScorer, TScoreCombiner> where
    TScorer: Scorer,
    TScoreCombiner: ScoreCombiner, 
[src]

+
[src]

 
Goes to the next element. .advance(...) needs to be called a first time to point to the correct element. Read more

-
[src]

+
[src]

 
Returns the number documents matching. Read more

-
[src]

+
[src]

 
After skipping, position the iterator in such a way that .doc() will return a value greater than or equal to target. Read more

-
[src]

+
[src]

 
Returns the current document

-
[src]

+
[src]

 
Returns a best-effort hint of the length of the docset. Read more

 
[src]

 
Fills a given mutable buffer with the next doc ids from the DocSet Read more

@@ -85,8 +85,8 @@
 
Advances the cursor to the next document None is returned if the iterator has DocSet has already been entirely consumed. Read more

 
[src]

 
Appends all docs to a bitset.

-
impl<TScorer, TScoreCombiner> Scorer for Union<TScorer, TScoreCombiner> where
    TScoreCombiner: ScoreCombiner,
    TScorer: Scorer, 
[src]

-
[src]

+
impl<TScorer, TScoreCombiner> Scorer for Union<TScorer, TScoreCombiner> where
    TScoreCombiner: ScoreCombiner,
    TScorer: Scorer, 
[src]

+
[src]

 
Returns the score. Read more

 
[src]

 
Consumes the complete DocSet and push the scored documents to the collector. Read more

diff --git a/master/tantivy/query/trait.Scorer.html b/master/tantivy/query/trait.Scorer.html
index e235380be..c228d3768 100644
--- a/master/tantivy/query/trait.Scorer.html
+++ b/master/tantivy/query/trait.Scorer.html
@@ -120,7 +120,7 @@ push the scored documents to the collector.

 
  • [src]
    impl<TDocSet: DocSet + 'static> Scorer for ConstScorer<TDocSet>
    • 
 
  • [src]
    impl Scorer for AllScorer
    • 
 
  • [src]
    impl<TScorer, TDocSetExclude> Scorer for Exclude<TScorer, TDocSetExclude> where
        TScorer: Scorer,
        TDocSetExclude: DocSet + 'static, 
    • 
-
  • [src]
    impl<TScorer, TScoreCombiner> Scorer for Union<TScorer, TScoreCombiner> where
        TScoreCombiner: ScoreCombiner,
        TScorer: Scorer, 
    • 
+
  • [src]
    impl<TScorer, TScoreCombiner> Scorer for Union<TScorer, TScoreCombiner> where
        TScoreCombiner: ScoreCombiner,
        TScorer: Scorer, 
    • 
 
  • [src]
    impl<TScorer> Scorer for Intersection<TScorer> where
        TScorer: Scorer, 
    • 
 
  • [src]
    impl<TReqScorer, TOptScorer, TScoreCombiner> Scorer for RequiredOptionalScorer<TReqScorer, TOptScorer, TScoreCombiner> where
        TReqScorer: Scorer,
        TOptScorer: Scorer,
        TScoreCombiner: ScoreCombiner, 
    •