Install new pub/priv/export rules as defaults, old rules accessible under #[legacy_exports];

17 files changed, 64 insertions, 11 deletions

diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index e3522c9b4d7..d2b314adf9c 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -19,6 +19,7 @@ type CrateAttrs = {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
 
     fn parse_attributes(source: ~str) -> ~[ast::attribute] {
         use syntax::parse;
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index ea049e0d9fc..77665977d4a 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -290,6 +290,7 @@ fn should_extract_impl_method_docs() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index 2dddc42b50c..177482a5e93 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -294,6 +294,7 @@ fn should_error_with_no_pandoc() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn parse_config(args: ~[~str]) -> Result<Config, ~str> {
         parse_config_(args, mock_program_output)
     }
diff --git a/src/rustdoc/demo.rs b/src/rustdoc/demo.rs
index cb50753d87e..bf1cdf2622e 100644
--- a/src/rustdoc/demo.rs
+++ b/src/rustdoc/demo.rs
@@ -63,6 +63,7 @@ fn take_my_order_please(
 }
 
 mod fortress_of_solitude {
+    #[legacy_exports];
     /*!
      * Superman's vacation home
      *
@@ -77,6 +78,7 @@ mod fortress_of_solitude {
 }
 
 mod blade_runner {
+    #[legacy_exports];
     /*!
      * Blade Runner is probably the best movie ever
      *
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index 7e08ce711e7..a1d365506ae 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -83,6 +83,7 @@ fn should_promote_impl_method_desc() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index ba617b7cce6..93217f2887f 100644
--- a/src/rustdoc/extract.rs
+++ b/src/rustdoc/extract.rs
@@ -328,6 +328,7 @@ fn should_extract_struct_fields() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
 
     fn mk_doc(source: ~str) -> doc::Doc {
         let ast = parse::from_str(source);
@@ -377,7 +378,8 @@ mod test {
     fn extract_fns() {
         let doc = mk_doc(
             ~"fn a() { } \
-             mod b { fn c() { } }");
+             mod b {
+                 #[legacy_exports]; fn c() { } }");
         assert doc.cratemod().fns()[0].name() == ~"a";
         assert doc.cratemod().mods()[0].fns()[0].name() == ~"c";
     }
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
index ca2f352d15c..cf97308fd0e 100644
--- a/src/rustdoc/markdown_index_pass.rs
+++ b/src/rustdoc/markdown_index_pass.rs
@@ -226,6 +226,7 @@ fn should_index_foreign_mod_contents() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(output_style: config::OutputStyle, source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let config = {
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index 39971bc91e7..428628ee676 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -61,7 +61,8 @@ fn should_write_modules_last() {
     let markdown = test::render(
         ~"mod a { }\
          fn b() { }\
-         mod c { }\
+         mod c {
+             #[legacy_exports]; }\
          fn d() { }"
     );
 
@@ -334,7 +335,8 @@ fn should_write_sections() {
         ~"#[doc = \"\
          # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert str::contains(markdown, ~"#### Header\n\nBody\n\n");
 }
 
@@ -795,6 +797,7 @@ fn should_write_struct_header() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn render(source: ~str) -> ~str {
         let (srv, doc) = create_doc_srv(source);
         let markdown = write_markdown_str_srv(srv, doc);
diff --git a/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index 59d8f6d7657..5749e4dcb23 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -244,6 +244,7 @@ fn should_name_mod_file_names_by_path() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(name: ~str, source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, name);
diff --git a/src/rustdoc/page_pass.rs b/src/rustdoc/page_pass.rs
index f9f3d3c9e1e..48b57c7361d 100644
--- a/src/rustdoc/page_pass.rs
+++ b/src/rustdoc/page_pass.rs
@@ -160,6 +160,7 @@ fn should_remove_foreign_mods_from_containing_mods() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc_(
         output_style: config::OutputStyle,
         source: ~str
diff --git a/src/rustdoc/prune_hidden_pass.rs b/src/rustdoc/prune_hidden_pass.rs
index 597c0418c51..bf2ea216e6e 100644
--- a/src/rustdoc/prune_hidden_pass.rs
+++ b/src/rustdoc/prune_hidden_pass.rs
@@ -54,6 +54,7 @@ fn should_prune_hidden_items() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
index a93f47e5223..1686f56e3f1 100644
--- a/src/rustdoc/rustdoc.rc
+++ b/src/rustdoc/rustdoc.rc
@@ -11,6 +11,7 @@
 
 #[no_core];
 #[legacy_modes];
+#[legacy_exports];
 
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_implicitly_copyable_typarams)];
@@ -23,30 +24,56 @@ extern mod syntax(vers = "0.4");
 use core::*;
 use std::par;
 
+#[legacy_exports]
 mod pass;
+#[legacy_exports]
 mod config;
+#[legacy_exports]
 mod parse;
+#[legacy_exports]
 mod extract;
+#[legacy_exports]
 mod attr_parser;
+#[legacy_exports]
 mod doc;
+#[legacy_exports]
 mod markdown_index_pass;
+#[legacy_exports]
 mod markdown_pass;
+#[legacy_exports]
 mod markdown_writer;
+#[legacy_exports]
 mod fold;
+#[legacy_exports]
 mod path_pass;
+#[legacy_exports]
 mod attr_pass;
+#[legacy_exports]
 mod tystr_pass;
+#[legacy_exports]
 mod prune_hidden_pass;
+#[legacy_exports]
 mod desc_to_brief_pass;
+#[legacy_exports]
 mod text_pass;
+#[legacy_exports]
 mod unindent_pass;
+#[legacy_exports]
 mod trim_pass;
+#[legacy_exports]
 mod astsrv;
+#[legacy_exports]
 mod demo;
+#[legacy_exports]
 mod sort_pass;
+#[legacy_exports]
 mod sort_item_name_pass;
+#[legacy_exports]
 mod sort_item_type_pass;
+#[legacy_exports]
 mod page_pass;
+#[legacy_exports]
 mod sectionalize_pass;
+#[legacy_exports]
 mod escape_pass;
-mod prune_private_pass;
\ No newline at end of file
+mod prune_private_pass;
diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs
index 2a011889536..583817aef8b 100644
--- a/src/rustdoc/sectionalize_pass.rs
+++ b/src/rustdoc/sectionalize_pass.rs
@@ -149,7 +149,8 @@ fn should_create_section_headers() {
         ~"#[doc = \"\
          # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert str::contains(
         doc.cratemod().mods()[0].item.sections[0].header,
         ~"Header");
@@ -161,7 +162,8 @@ fn should_create_section_bodies() {
         ~"#[doc = \"\
          # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert str::contains(
         doc.cratemod().mods()[0].item.sections[0].body,
         ~"Body");
@@ -173,7 +175,8 @@ fn should_not_create_sections_from_indented_headers() {
         ~"#[doc = \"\n\
          Text\n             # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert vec::is_empty(doc.cratemod().mods()[0].item.sections);
 }
 
@@ -184,7 +187,8 @@ fn should_remove_section_text_from_main_desc() {
          Description\n\n\
          # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert !str::contains(
         option::get(doc.cratemod().mods()[0].desc()),
         ~"Header");
@@ -199,7 +203,8 @@ fn should_eliminate_desc_if_it_is_just_whitespace() {
         ~"#[doc = \"\
          # Header\n\
          Body\"]\
-         mod a { }");
+         mod a {
+             #[legacy_exports]; }");
     assert doc.cratemod().mods()[0].desc() == None;
 }
 
@@ -227,6 +232,7 @@ fn should_sectionalize_impl_methods() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/sort_item_type_pass.rs b/src/rustdoc/sort_item_type_pass.rs
index 70ad14e1efd..4ace822d88c 100644
--- a/src/rustdoc/sort_item_type_pass.rs
+++ b/src/rustdoc/sort_item_type_pass.rs
@@ -30,7 +30,8 @@ fn mk_pass() -> Pass {
 fn test() {
     let source =
         ~"mod imod { } \
-         extern mod inmod { } \
+         extern mod inmod {
+             #[legacy_exports]; } \
          const iconst: int = 0; \
          fn ifn() { } \
          enum ienum { ivar } \
diff --git a/src/rustdoc/text_pass.rs b/src/rustdoc/text_pass.rs
index 9f7d6fda18f..daa67ff3b0e 100644
--- a/src/rustdoc/text_pass.rs
+++ b/src/rustdoc/text_pass.rs
@@ -252,6 +252,7 @@ fn should_execute_on_impl_method_section_bodies() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/trim_pass.rs b/src/rustdoc/trim_pass.rs
index b611551d23b..2ff6e1ea442 100644
--- a/src/rustdoc/trim_pass.rs
+++ b/src/rustdoc/trim_pass.rs
@@ -16,12 +16,14 @@ fn mk_pass() -> Pass {
 #[test]
 fn should_trim_text() {
     let doc = test::mk_doc(~"#[doc = \" desc \"] \
-                            mod m { }");
+                            mod m {
+                                #[legacy_exports]; }");
     assert doc.cratemod().mods()[0].desc() == Some(~"desc");
 }
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index 76a5815c942..97313e06caa 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -389,6 +389,7 @@ fn should_not_serialize_struct_attrs() {
 
 #[cfg(test)]
 mod test {
+    #[legacy_exports];
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");