---

yaml
---
r: 140763
b: refs/heads/try2
c: 56a1ee8
h: refs/heads/master
i:
  140761: b004e48
  140759: a456d59
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 58a37a1f485a738f6802b42dd39437618b18bbae
+refs/heads/try2: 56a1ee8f84e4aa2b9a45fe3fa7425ae8c8e6649a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/markdown_index_pass.rs

@@ -252,20 +252,6 @@ mod test {
         });
     }
 
-    #[test]
-    fn should_index_foreign_mod_pages() {
-        let doc = mk_doc(
-            config::DocPerMod,
-            ~"extern mod a { }"
-        );
-        assert!((&doc.cratemod().index).get().entries[0] == doc::IndexEntry {
-            kind: ~"Foreign module",
-            name: ~"a",
-            brief: None,
-            link: ~"a.html"
-        });
-    }
-
     #[test]
     fn should_add_brief_desc_to_index() {
         let doc = mk_doc(
@@ -280,7 +266,7 @@ mod test {
     fn should_index_foreign_mod_contents() {
         let doc = mk_doc(
             config::DocPerCrate,
-            ~"extern mod a { fn b(); }"
+            ~"extern { fn b(); }"
         );
         assert!((&doc.cratemod().nmods()[0].index).get().entries[0]
                 == doc::IndexEntry {

branches/try2/src/librustdoc/markdown_pass.rs

@@ -702,31 +702,24 @@ mod test {
 
     #[test]
     fn should_write_index_for_foreign_mods() {
-        let markdown = render(~"extern mod a { fn a(); }");
+        let markdown = render(~"extern { fn a(); }");
         assert!(str::contains(
             markdown,
             ~"\n\n* [Function `a`](#function-a)\n\n"
         ));
     }
 
-    #[test]
-    fn should_write_foreign_mods() {
-        let markdown = render(~"#[doc = \"test\"] extern mod a { }");
-        assert!(str::contains(markdown, ~"Foreign module `a`"));
-        assert!(str::contains(markdown, ~"test"));
-    }
-
     #[test]
     fn should_write_foreign_fns() {
         let markdown = render(
-            ~"extern mod a { #[doc = \"test\"] fn a(); }");
+            ~"extern { #[doc = \"test\"] fn a(); }");
         assert!(str::contains(markdown, ~"test"));
     }
 
     #[test]
     fn should_write_foreign_fn_headers() {
         let markdown = render(
-            ~"extern mod a { #[doc = \"test\"] fn a(); }");
+            ~"extern { #[doc = \"test\"] fn a(); }");
         assert!(str::contains(markdown, ~"## Function `a`"));
     }
 

branches/try2/src/librustdoc/sort_item_type_pass.rs

@@ -43,8 +43,6 @@ fn test() {
 
     let source =
         ~"mod imod { } \
-         extern mod inmod {
-         } \
          static iconst: int = 0; \
          fn ifn() { } \
          enum ienum { ivar } \
@@ -63,6 +61,5 @@ fn test() {
         assert!(doc.cratemod().items[5].name() == ~"__extensions__");
         assert!(doc.cratemod().items[6].name() == ~"ifn");
         assert!(doc.cratemod().items[7].name() == ~"imod");
-        assert!(doc.cratemod().items[8].name() == ~"inmod");
     }
 }

branches/try2/src/librustdoc/tystr_pass.rs

@@ -365,7 +365,7 @@ mod test {
 
     #[test]
     fn should_add_foreign_fn_sig() {
-        let doc = mk_doc(~"extern mod a { fn a<T>() -> int; }");
+        let doc = mk_doc(~"extern { fn a<T>() -> int; }");
         assert!(doc.cratemod().nmods()[0].fns[0].sig ==
                 Some(~"fn a<T>() -> int"));
     }