diff --git a/src/librustdoc/markdown_index_pass.rs b/src/librustdoc/markdown_index_pass.rs index d9e24453652..24bfa62305a 100644 --- a/src/librustdoc/markdown_index_pass.rs +++ b/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 { diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs index e376e4afa5c..65171c30a52 100644 --- a/src/librustdoc/markdown_pass.rs +++ b/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`")); } diff --git a/src/librustdoc/sort_item_type_pass.rs b/src/librustdoc/sort_item_type_pass.rs index d75565d4ec8..158d407fff6 100644 --- a/src/librustdoc/sort_item_type_pass.rs +++ b/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"); } } diff --git a/src/librustdoc/tystr_pass.rs b/src/librustdoc/tystr_pass.rs index def32bdfd44..9006543a4de 100644 --- a/src/librustdoc/tystr_pass.rs +++ b/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() -> int; }"); + let doc = mk_doc(~"extern { fn a() -> int; }"); assert!(doc.cratemod().nmods()[0].fns[0].sig == Some(~"fn a() -> int")); }