---

yaml
---
r: 22011
b: refs/heads/snap-stage3
c: c675cd3
h: refs/heads/master
i:
  22009: af66256
  22007: 0380cc4
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 991cbfe42c8836e8b4adfcaf288d5c0b8d57397c
+refs/heads/snap-stage3: c675cd396d729ad7e427abd370489767a0db6ab6
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustdoc/markdown_index_pass.rs

@@ -127,7 +127,12 @@ fn pandoc_header_id(header: ~str) -> ~str {
         return s;
     }
     fn replace_with_hyphens(s: ~str) -> ~str {
-        str::replace(s, ~" ", ~"-")
+        // Collapse sequences of whitespace to a single dash
+        // XXX: Hacky implementation here that only covers
+        // one or two spaces.
+        let s = str::replace(s, ~"  ", ~"-");
+        let s = str::replace(s, ~" ", ~"-");
+        return s;
     }
     fn convert_to_lowercase(s: ~str) -> ~str { str::to_lower(s) }
     fn remove_up_to_first_letter(s: ~str) -> ~str { s }
@@ -144,6 +149,8 @@ fn should_remove_punctuation_from_headers() {
         == ~"impl-of-numnum-for-int";
     assert pandoc_header_id(~"impl of num::num for ^int")
         == ~"impl-of-numnum-for-int";
+    assert pandoc_header_id(~"impl for & condvar")
+        == ~"impl-for-condvar";
 }
 
 #[test]