From 47cd1e4fc8e8f3cdab7d8b5864a8f2733c016cd4 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Sat, 29 Dec 2012 17:38:20 -0800 Subject: [PATCH] librustdoc: Fix a bunch of rustdoc tests. rs=bustage --- src/librustdoc/astsrv.rs | 1 + src/librustdoc/attr_parser.rs | 3 +++ src/librustdoc/attr_pass.rs | 5 +++++ src/librustdoc/desc_to_brief_pass.rs | 6 ++++++ src/librustdoc/extract.rs | 6 ++++++ src/librustdoc/fold.rs | 3 +++ src/librustdoc/markdown_index_pass.rs | 9 ++++++++ src/librustdoc/markdown_pass.rs | 31 +++++++++++++++++++++++++++ src/librustdoc/markdown_writer.rs | 6 ++++++ src/librustdoc/page_pass.rs | 6 ++++++ src/librustdoc/pass.rs | 1 + src/librustdoc/path_pass.rs | 1 + src/librustdoc/prune_hidden_pass.rs | 5 +++++ src/librustdoc/prune_private_pass.rs | 5 +++++ src/librustdoc/sectionalize_pass.rs | 3 +++ src/librustdoc/sort_pass.rs | 1 + src/librustdoc/text_pass.rs | 10 +++++++++ src/librustdoc/trim_pass.rs | 6 ++++++ src/librustdoc/tystr_pass.rs | 5 +++++ 19 files changed, 113 insertions(+) diff --git a/src/librustdoc/astsrv.rs b/src/librustdoc/astsrv.rs index bdb92611454..83516a589b5 100644 --- a/src/librustdoc/astsrv.rs +++ b/src/librustdoc/astsrv.rs @@ -21,6 +21,7 @@ use parse; use util; use core::oldcomm; +use core::vec; use rustc::back::link; use rustc::driver::driver; use rustc::driver::session::Session; diff --git a/src/librustdoc/attr_parser.rs b/src/librustdoc/attr_parser.rs index 9acef45cc92..e47bdbb00da 100644 --- a/src/librustdoc/attr_parser.rs +++ b/src/librustdoc/attr_parser.rs @@ -31,6 +31,9 @@ pub type CrateAttrs = { mod test { #[legacy_exports]; + use syntax::ast; + use syntax; + fn parse_attributes(+source: ~str) -> ~[ast::attribute] { use syntax::parse; use syntax::parse::parser; diff --git a/src/librustdoc/attr_pass.rs b/src/librustdoc/attr_pass.rs index 7562016cf47..812185ec34d 100644 --- a/src/librustdoc/attr_pass.rs +++ b/src/librustdoc/attr_pass.rs @@ -310,6 +310,11 @@ fn should_extract_impl_method_docs() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use doc; + use extract; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/desc_to_brief_pass.rs b/src/librustdoc/desc_to_brief_pass.rs index f9c0fb829d0..2c3998cecee 100644 --- a/src/librustdoc/desc_to_brief_pass.rs +++ b/src/librustdoc/desc_to_brief_pass.rs @@ -100,6 +100,12 @@ fn should_promote_impl_method_desc() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use attr_pass; + use doc; + use extract; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/extract.rs b/src/librustdoc/extract.rs index b4912f13983..8f2c61ba26e 100644 --- a/src/librustdoc/extract.rs +++ b/src/librustdoc/extract.rs @@ -344,6 +344,12 @@ fn should_extract_struct_fields() { mod test { #[legacy_exports]; + use astsrv; + use doc; + use parse; + + use core::vec; + fn mk_doc(+source: ~str) -> doc::Doc { let ast = parse::from_str(source); extract(ast, ~"") diff --git a/src/librustdoc/fold.rs b/src/librustdoc/fold.rs index 85f218d8f16..deb6af224e5 100644 --- a/src/librustdoc/fold.rs +++ b/src/librustdoc/fold.rs @@ -8,7 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use astsrv; use doc; +use extract; +use parse; use core::vec; use std::par; diff --git a/src/librustdoc/markdown_index_pass.rs b/src/librustdoc/markdown_index_pass.rs index cdf2c48dd7d..1408ae87416 100644 --- a/src/librustdoc/markdown_index_pass.rs +++ b/src/librustdoc/markdown_index_pass.rs @@ -252,6 +252,15 @@ fn should_index_foreign_mod_contents() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use attr_pass; + use config; + use desc_to_brief_pass; + use doc; + use extract; + use path_pass; + fn mk_doc(output_style: config::OutputStyle, +source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let config = { diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs index 39ba0bafb0d..6ed2e98010c 100644 --- a/src/librustdoc/markdown_pass.rs +++ b/src/librustdoc/markdown_pass.rs @@ -11,15 +11,28 @@ //! Generate markdown from a document tree use astsrv; +use attr_pass; +use config; +use desc_to_brief_pass; use doc::ItemUtils; use doc; +use extract; use fold; +use markdown_index_pass; use markdown_pass; use markdown_writer::Writer; use markdown_writer::WriterUtils; use markdown_writer::WriterFactory; +use markdown_writer; +use page_pass; +use path_pass; +use sectionalize_pass; use sort_pass; +use trim_pass; +use unindent_pass; +use core::iter; +use core::oldcomm; use core::str; use core::vec; use std::par; @@ -817,6 +830,24 @@ fn should_write_struct_header() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use attr_pass; + use config; + use desc_to_brief_pass; + use doc; + use extract; + use markdown_index_pass; + use markdown_writer; + use path_pass; + use sectionalize_pass; + use trim_pass; + use tystr_pass; + use unindent_pass; + + use core::oldcomm; + use core::str; + fn render(+source: ~str) -> ~str { let (srv, doc) = create_doc_srv(source); let markdown = write_markdown_str_srv(srv, doc); diff --git a/src/librustdoc/markdown_writer.rs b/src/librustdoc/markdown_writer.rs index adad3c5f5e1..f4e5db304e7 100644 --- a/src/librustdoc/markdown_writer.rs +++ b/src/librustdoc/markdown_writer.rs @@ -267,6 +267,12 @@ fn should_name_mod_file_names_by_path() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use doc; + use extract; + use path_pass; + 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/librustdoc/page_pass.rs b/src/librustdoc/page_pass.rs index d582119081b..0709cc5dc55 100644 --- a/src/librustdoc/page_pass.rs +++ b/src/librustdoc/page_pass.rs @@ -183,6 +183,12 @@ fn should_remove_foreign_mods_from_containing_mods() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use config; + use doc; + use extract; + fn mk_doc_( output_style: config::OutputStyle, source: ~str diff --git a/src/librustdoc/pass.rs b/src/librustdoc/pass.rs index cc3bdf9f82c..967dcd8f49f 100644 --- a/src/librustdoc/pass.rs +++ b/src/librustdoc/pass.rs @@ -10,6 +10,7 @@ use astsrv; use doc; +use extract; use core::vec; diff --git a/src/librustdoc/path_pass.rs b/src/librustdoc/path_pass.rs index e183c13b90f..4227ce23096 100644 --- a/src/librustdoc/path_pass.rs +++ b/src/librustdoc/path_pass.rs @@ -13,6 +13,7 @@ use astsrv; use doc::ItemUtils; use doc; +use extract; use fold::Fold; use fold; diff --git a/src/librustdoc/prune_hidden_pass.rs b/src/librustdoc/prune_hidden_pass.rs index c5756571a41..da3c6bd7f2b 100644 --- a/src/librustdoc/prune_hidden_pass.rs +++ b/src/librustdoc/prune_hidden_pass.rs @@ -71,6 +71,11 @@ fn should_prune_hidden_items() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use doc; + use extract; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/prune_private_pass.rs b/src/librustdoc/prune_private_pass.rs index c1852128622..5017f889d5a 100644 --- a/src/librustdoc/prune_private_pass.rs +++ b/src/librustdoc/prune_private_pass.rs @@ -18,6 +18,7 @@ use fold::Fold; use fold; use core::util; +use core::vec; use syntax::ast; export mk_pass; @@ -75,6 +76,10 @@ fn should_prune_items_without_pub_modifier() { #[cfg(test)] mod test { + use astsrv; + use doc; + use extract; + pub fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/sectionalize_pass.rs b/src/librustdoc/sectionalize_pass.rs index 090016a6f9c..c5933ba3dfc 100644 --- a/src/librustdoc/sectionalize_pass.rs +++ b/src/librustdoc/sectionalize_pass.rs @@ -11,12 +11,15 @@ //! Breaks rustdocs into sections according to their headers use astsrv; +use attr_pass; use doc::ItemUtils; use doc; +use extract; use fold::Fold; use fold; use core::str; +use core::vec; use std::par; pub fn mk_pass() -> Pass { diff --git a/src/librustdoc/sort_pass.rs b/src/librustdoc/sort_pass.rs index a660f0c42ad..fcf878dbf8d 100644 --- a/src/librustdoc/sort_pass.rs +++ b/src/librustdoc/sort_pass.rs @@ -13,6 +13,7 @@ use astsrv; use doc::ItemUtils; use doc; +use extract; use fold::Fold; use fold; use util::NominalOp; diff --git a/src/librustdoc/text_pass.rs b/src/librustdoc/text_pass.rs index 30e91f95569..ae205883902 100644 --- a/src/librustdoc/text_pass.rs +++ b/src/librustdoc/text_pass.rs @@ -289,6 +289,16 @@ fn should_execute_on_impl_method_section_bodies() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use attr_pass; + use desc_to_brief_pass; + use doc; + use extract; + use sectionalize_pass; + + use core::str; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/trim_pass.rs b/src/librustdoc/trim_pass.rs index 78f56ceaba7..d03d31c754c 100644 --- a/src/librustdoc/trim_pass.rs +++ b/src/librustdoc/trim_pass.rs @@ -36,6 +36,12 @@ fn should_trim_text() { #[cfg(test)] mod test { #[legacy_exports]; + + use astrsrv; + use attr_pass; + use doc; + use extract; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~""); diff --git a/src/librustdoc/tystr_pass.rs b/src/librustdoc/tystr_pass.rs index ae69e83c3c7..92f2e0a5e8b 100644 --- a/src/librustdoc/tystr_pass.rs +++ b/src/librustdoc/tystr_pass.rs @@ -407,6 +407,11 @@ fn should_not_serialize_struct_attrs() { #[cfg(test)] mod test { #[legacy_exports]; + + use astsrv; + use doc; + use extract; + fn mk_doc(source: ~str) -> doc::Doc { do astsrv::from_str(source) |srv| { let doc = extract::from_srv(srv, ~"");