Don't duplicate children

Fixes #105

Author: nrc

src/analysis.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::time::SystemTime;
 
@@ -30,7 +30,7 @@ pub struct PerCrateAnalysis {
     pub def_id_for_span: HashMap<Span, Id>,
     pub defs: HashMap<Id, Def>,
     pub defs_per_file: HashMap<PathBuf, Vec<Id>>,
-    pub children: HashMap<Id, Vec<Id>>,
+    pub children: HashMap<Id, HashSet<Id>>,
     pub def_names: HashMap<String, Vec<Id>>,
     pub ref_spans: HashMap<Id, Vec<Span>>,
     pub globs: HashMap<Span, Glob>,

src/lowering.rs

@@ -17,7 +17,7 @@ use util;
 
 use span;
 
-use std::collections::HashMap;
+use std::collections::{HashSet, HashMap};
 use std::iter::Extend;
 use std::path::{Path, PathBuf};
 use std::time::Instant;
@@ -205,14 +205,14 @@ impl CrateReader {
                     .push(id);
                 let parent = d.parent.map(|id| self.id_from_compiler_id(&id));
                 if let Some(parent) = parent {
-                    analysis
+                    let children = analysis
                         .children
                         .entry(parent)
-                        .or_insert_with(|| vec![])
-                        .push(id);
+                        .or_insert_with(HashSet::new);
+                    children.insert(id);
                 }
                 if !d.children.is_empty() {
-                    let children_for_id = analysis.children.entry(id).or_insert_with(Vec::new);
+                    let children_for_id = analysis.children.entry(id).or_insert_with(HashSet::new);
                     children_for_id
                         .extend(d.children.iter().map(|id| self.id_from_compiler_id(id)));
                 }

src/test/mod.rs

@@ -290,9 +290,23 @@ fn test_types() {
     assert_type(&host, "TEST_STATIC", DefKind::Static, &[13]);
     assert_type(&host, "test_module", DefKind::Mod, &[17]);
     assert_type(&host, "TestType", DefKind::Type, &[18]);
+    //assert_type(&host, "TestUnion", DefKind::Union, &[21]);
     assert_type(&host, "TestTrait", DefKind::Trait, &[25]);
     assert_type(&host, "test_method", DefKind::Method, &[26]);
     assert_type(&host, "FooEnum", DefKind::Enum, &[29]);
     assert_type(&host, "TupleVariant", DefKind::TupleVariant, &[30]);
     assert_type(&host, "StructVariant", DefKind::StructVariant, &[31]);
 }
+
+#[test]
+fn test_child_count() {
+    let host = AnalysisHost::new_with_loader(TestAnalysisLoader::new(
+        Path::new("test_data/types/save-analysis").to_owned(),
+    ));
+    host.reload(Path::new("test_data/types"), Path::new("test_data/types"))
+        .unwrap();
+
+    let ids = host.search_for_id("Foo").unwrap();
+    let id = ids[0];
+    assert_eq!(host.for_each_child_def(id, |id, _| id).unwrap().len(), 1);
+}