Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdoc: Remove unnecessary extern crate aliases #87120

Merged
merged 2 commits into from
Jul 14, 2021
Merged

rustdoc: Remove unnecessary extern crate aliases #87120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78eae0f
Remove renaming of `test` crate
jyn514 Jul 14, 2021
1006175
Remove useless alias from `rustc_span` to itself
jyn514 Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/librustdoc/doctest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,7 @@ crate fn run(options: Options) -> Result<(), ErrorReported> {

test_args.insert(0, "rustdoctest".to_string());

testing::test_main(
&test_args,
tests,
Some(testing::Options::new().display_output(display_warnings)),
);
test::test_main(&test_args, tests, Some(test::Options::new().display_output(display_warnings)));

// Collect and warn about unused externs, but only if we've gotten
// reports for each doctest
Expand Down Expand Up @@ -769,7 +765,7 @@ crate trait Tester {
}

crate struct Collector {
crate tests: Vec<testing::TestDescAndFn>,
crate tests: Vec<test::TestDescAndFn>,

// The name of the test displayed to the user, separated by `::`.
//
Expand Down Expand Up @@ -930,22 +926,22 @@ impl Tester for Collector {
};

debug!("creating test {}: {}", name, test);
self.tests.push(testing::TestDescAndFn {
desc: testing::TestDesc {
name: testing::DynTestName(name),
self.tests.push(test::TestDescAndFn {
desc: test::TestDesc {
name: test::DynTestName(name),
ignore: match config.ignore {
Ignore::All => true,
Ignore::None => false,
Ignore::Some(ref ignores) => ignores.iter().any(|s| target_str.contains(s)),
},
// compiler failures are test failures
should_panic: testing::ShouldPanic::No,
should_panic: test::ShouldPanic::No,
allow_fail: config.allow_fail,
compile_fail: config.compile_fail,
no_run,
test_type: testing::TestType::DocTest,
test_type: test::TestType::DocTest,
},
testfn: testing::DynTestFn(box move || {
testfn: test::DynTestFn(box move || {
let report_unused_externs = |uext| {
unused_externs.lock().unwrap().push(uext);
};
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ extern crate rustc_parse;
extern crate rustc_passes;
extern crate rustc_resolve;
extern crate rustc_session;
extern crate rustc_span as rustc_span;
extern crate rustc_span;
extern crate rustc_target;
extern crate rustc_trait_selection;
extern crate rustc_typeck;
extern crate test as testing;
extern crate test;

#[cfg(feature = "jemalloc")]
extern crate tikv_jemalloc_sys;
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ crate fn test(mut options: Options) -> Result<(), String> {
find_testable_code(&input_str, &mut collector, codes, options.enable_per_target_ignores, None);

options.test_args.insert(0, "rustdoctest".to_string());
testing::test_main(
test::test_main(
&options.test_args,
collector.tests,
Some(testing::Options::new().display_output(options.display_warnings)),
Some(test::Options::new().display_output(options.display_warnings)),
);
Ok(())
}