remove duplicates

Author: gpwclark

doc/mk-site.slosh

@@ -84,11 +84,12 @@ $(cargo build --manifest-path ~(str mdbook-eval-dir "/Cargo.toml"))
 (def mdbook-path (str mdbook-eval-dir "/target/debug"))
 (def new-path (str (env "PATH") ":" mdbook-path))
 
-(prn "Running mdbook build with PATH=" new-path)
-(sh (str "export PATH=\"" new-path "\" && mdbook build"))
-
-(sh "./search-hack-patch.sh")
-
-(when (= args-local.1 "serve")
-    (prn "Starting mdbook serve...")
-    (sh (str "export PATH=\"" new-path "\" && mdbook serve")))
+(if (= args-local.1 "serve")
+    (do
+        (prn "Starting mdbook serve...")
+        $(rm -rf book)
+        (sh (str "export PATH=\"" new-path "\" && mdbook serve")))
+    (do
+        (prn "Running mdbook build with PATH=" new-path)
+        (sh (str "export PATH=\"" new-path "\" && mdbook build"))
+        (sh "./search-hack-patch.sh")))

slosh_test_lib/src/docs.rs

@@ -153,6 +153,12 @@ impl Namespace {
         match self {
             Namespace::Global => {
                 for g in vm.globals().clone().keys() {
+                    // Skip namespace-qualified symbols (contain "::") - they'll
+                    // be collected when iterating their named namespace.
+                    let name = vm.get_interned(*g);
+                    if name.contains("::") {
+                        continue;
+                    }
                     self.get_doc(g, docs, vm, require_proper_format)?;
                 }
             }
@@ -420,6 +426,11 @@ impl SloshDoc {
         if let Some(slot) = slot {
             let doc_string = DocStringSection::new_incomplete(slot, &sym, vm);
             let symbol = sym.display_value(vm);
+            let mut full_name: Vec<_> = symbol.split("::").collect();
+            let symbol = full_name
+                .pop()
+                .expect("Symbol should never be an empty.")
+                .to_string();
             let symbol_type = sym.display_type(vm).to_string();
             let namespace = namespace.display(vm);
             Ok(SloshDoc {