Skip to content

Commit 47cd1e4

Browse files
committed
librustdoc: Fix a bunch of rustdoc tests. rs=bustage
1 parent 5245ace commit 47cd1e4

19 files changed

+113
-0
lines changed

src/librustdoc/astsrv.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use parse;
2121
use util;
2222

2323
use core::oldcomm;
24+
use core::vec;
2425
use rustc::back::link;
2526
use rustc::driver::driver;
2627
use rustc::driver::session::Session;

src/librustdoc/attr_parser.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ pub type CrateAttrs = {
3131
mod test {
3232
#[legacy_exports];
3333

34+
use syntax::ast;
35+
use syntax;
36+
3437
fn parse_attributes(+source: ~str) -> ~[ast::attribute] {
3538
use syntax::parse;
3639
use syntax::parse::parser;

src/librustdoc/attr_pass.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ fn should_extract_impl_method_docs() {
310310
#[cfg(test)]
311311
mod test {
312312
#[legacy_exports];
313+
314+
use astsrv;
315+
use doc;
316+
use extract;
317+
313318
fn mk_doc(source: ~str) -> doc::Doc {
314319
do astsrv::from_str(source) |srv| {
315320
let doc = extract::from_srv(srv, ~"");

src/librustdoc/desc_to_brief_pass.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ fn should_promote_impl_method_desc() {
100100
#[cfg(test)]
101101
mod test {
102102
#[legacy_exports];
103+
104+
use astsrv;
105+
use attr_pass;
106+
use doc;
107+
use extract;
108+
103109
fn mk_doc(source: ~str) -> doc::Doc {
104110
do astsrv::from_str(source) |srv| {
105111
let doc = extract::from_srv(srv, ~"");

src/librustdoc/extract.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,12 @@ fn should_extract_struct_fields() {
344344
mod test {
345345
#[legacy_exports];
346346

347+
use astsrv;
348+
use doc;
349+
use parse;
350+
351+
use core::vec;
352+
347353
fn mk_doc(+source: ~str) -> doc::Doc {
348354
let ast = parse::from_str(source);
349355
extract(ast, ~"")

src/librustdoc/fold.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use astsrv;
1112
use doc;
13+
use extract;
14+
use parse;
1215

1316
use core::vec;
1417
use std::par;

src/librustdoc/markdown_index_pass.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,15 @@ fn should_index_foreign_mod_contents() {
252252
#[cfg(test)]
253253
mod test {
254254
#[legacy_exports];
255+
256+
use astsrv;
257+
use attr_pass;
258+
use config;
259+
use desc_to_brief_pass;
260+
use doc;
261+
use extract;
262+
use path_pass;
263+
255264
fn mk_doc(output_style: config::OutputStyle, +source: ~str) -> doc::Doc {
256265
do astsrv::from_str(source) |srv| {
257266
let config = {

src/librustdoc/markdown_pass.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,28 @@
1111
//! Generate markdown from a document tree
1212
1313
use astsrv;
14+
use attr_pass;
15+
use config;
16+
use desc_to_brief_pass;
1417
use doc::ItemUtils;
1518
use doc;
19+
use extract;
1620
use fold;
21+
use markdown_index_pass;
1722
use markdown_pass;
1823
use markdown_writer::Writer;
1924
use markdown_writer::WriterUtils;
2025
use markdown_writer::WriterFactory;
26+
use markdown_writer;
27+
use page_pass;
28+
use path_pass;
29+
use sectionalize_pass;
2130
use sort_pass;
31+
use trim_pass;
32+
use unindent_pass;
2233

34+
use core::iter;
35+
use core::oldcomm;
2336
use core::str;
2437
use core::vec;
2538
use std::par;
@@ -817,6 +830,24 @@ fn should_write_struct_header() {
817830
#[cfg(test)]
818831
mod test {
819832
#[legacy_exports];
833+
834+
use astsrv;
835+
use attr_pass;
836+
use config;
837+
use desc_to_brief_pass;
838+
use doc;
839+
use extract;
840+
use markdown_index_pass;
841+
use markdown_writer;
842+
use path_pass;
843+
use sectionalize_pass;
844+
use trim_pass;
845+
use tystr_pass;
846+
use unindent_pass;
847+
848+
use core::oldcomm;
849+
use core::str;
850+
820851
fn render(+source: ~str) -> ~str {
821852
let (srv, doc) = create_doc_srv(source);
822853
let markdown = write_markdown_str_srv(srv, doc);

src/librustdoc/markdown_writer.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@ fn should_name_mod_file_names_by_path() {
267267
#[cfg(test)]
268268
mod test {
269269
#[legacy_exports];
270+
271+
use astsrv;
272+
use doc;
273+
use extract;
274+
use path_pass;
275+
270276
fn mk_doc(+name: ~str, +source: ~str) -> doc::Doc {
271277
do astsrv::from_str(source) |srv| {
272278
let doc = extract::from_srv(srv, name);

src/librustdoc/page_pass.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,12 @@ fn should_remove_foreign_mods_from_containing_mods() {
183183
#[cfg(test)]
184184
mod test {
185185
#[legacy_exports];
186+
187+
use astsrv;
188+
use config;
189+
use doc;
190+
use extract;
191+
186192
fn mk_doc_(
187193
output_style: config::OutputStyle,
188194
source: ~str

src/librustdoc/pass.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use astsrv;
1212
use doc;
13+
use extract;
1314

1415
use core::vec;
1516

src/librustdoc/path_pass.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use astsrv;
1414
use doc::ItemUtils;
1515
use doc;
16+
use extract;
1617
use fold::Fold;
1718
use fold;
1819

src/librustdoc/prune_hidden_pass.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ fn should_prune_hidden_items() {
7171
#[cfg(test)]
7272
mod test {
7373
#[legacy_exports];
74+
75+
use astsrv;
76+
use doc;
77+
use extract;
78+
7479
fn mk_doc(source: ~str) -> doc::Doc {
7580
do astsrv::from_str(source) |srv| {
7681
let doc = extract::from_srv(srv, ~"");

src/librustdoc/prune_private_pass.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use fold::Fold;
1818
use fold;
1919

2020
use core::util;
21+
use core::vec;
2122
use syntax::ast;
2223

2324
export mk_pass;
@@ -75,6 +76,10 @@ fn should_prune_items_without_pub_modifier() {
7576

7677
#[cfg(test)]
7778
mod test {
79+
use astsrv;
80+
use doc;
81+
use extract;
82+
7883
pub fn mk_doc(source: ~str) -> doc::Doc {
7984
do astsrv::from_str(source) |srv| {
8085
let doc = extract::from_srv(srv, ~"");

src/librustdoc/sectionalize_pass.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
//! Breaks rustdocs into sections according to their headers
1212
1313
use astsrv;
14+
use attr_pass;
1415
use doc::ItemUtils;
1516
use doc;
17+
use extract;
1618
use fold::Fold;
1719
use fold;
1820

1921
use core::str;
22+
use core::vec;
2023
use std::par;
2124

2225
pub fn mk_pass() -> Pass {

src/librustdoc/sort_pass.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use astsrv;
1414
use doc::ItemUtils;
1515
use doc;
16+
use extract;
1617
use fold::Fold;
1718
use fold;
1819
use util::NominalOp;

src/librustdoc/text_pass.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,16 @@ fn should_execute_on_impl_method_section_bodies() {
289289
#[cfg(test)]
290290
mod test {
291291
#[legacy_exports];
292+
293+
use astsrv;
294+
use attr_pass;
295+
use desc_to_brief_pass;
296+
use doc;
297+
use extract;
298+
use sectionalize_pass;
299+
300+
use core::str;
301+
292302
fn mk_doc(source: ~str) -> doc::Doc {
293303
do astsrv::from_str(source) |srv| {
294304
let doc = extract::from_srv(srv, ~"");

src/librustdoc/trim_pass.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ fn should_trim_text() {
3636
#[cfg(test)]
3737
mod test {
3838
#[legacy_exports];
39+
40+
use astrsrv;
41+
use attr_pass;
42+
use doc;
43+
use extract;
44+
3945
fn mk_doc(source: ~str) -> doc::Doc {
4046
do astsrv::from_str(source) |srv| {
4147
let doc = extract::from_srv(srv, ~"");

src/librustdoc/tystr_pass.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,11 @@ fn should_not_serialize_struct_attrs() {
407407
#[cfg(test)]
408408
mod test {
409409
#[legacy_exports];
410+
411+
use astsrv;
412+
use doc;
413+
use extract;
414+
410415
fn mk_doc(source: ~str) -> doc::Doc {
411416
do astsrv::from_str(source) |srv| {
412417
let doc = extract::from_srv(srv, ~"");

0 commit comments

Comments
 (0)