mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove renaming of test crate

Browse Source 
This is leftover from when `doctest` used to be called `test`. Remove it
now, it's unnecessary and makes the code harder to read.
This commit is contained in:
Joshua Nelson 2021-07-13 21:40:09 -04:00
parent 3e1c75c6e2
commit 78eae0fd4a
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustdoc/doctest.rs
View File

@ -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
@ -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 `::`.
//
@ -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);
};

2
src/librustdoc/lib.rs
View File

@ -57,7 +57,7 @@ extern crate rustc_span as 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;

4
src/librustdoc/markdown.rs
View File

@ -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(())
}