From df975cf9c27681da7751c12f19850e67940593df Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 27 Aug 2020 18:20:15 +0200
Subject: [PATCH] Rename rustdoc/test -> rustdoc/doctest

This modules contains the implementation of doctests, and not the
tests of rustdoc itself. This name is confusing, so let's rename it to
doctest for clarity.
---
 src/librustdoc/{test.rs => doctest.rs}    | 0
 src/librustdoc/{test => doctest}/tests.rs | 0
 src/librustdoc/html/markdown.rs           | 6 +++---
 src/librustdoc/lib.rs                     | 4 ++--
 src/librustdoc/markdown.rs                | 2 +-
 src/librustdoc/passes/doc_test_lints.rs   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/librustdoc/{test.rs => doctest.rs} (100%)
 rename src/librustdoc/{test => doctest}/tests.rs (100%)

diff --git a/src/librustdoc/test.rs b/src/librustdoc/doctest.rs
similarity index 100%
rename from src/librustdoc/test.rs
rename to src/librustdoc/doctest.rs
diff --git a/src/librustdoc/test/tests.rs b/src/librustdoc/doctest/tests.rs
similarity index 100%
rename from src/librustdoc/test/tests.rs
rename to src/librustdoc/doctest/tests.rs
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index b2589e5b806e8..56499f736e163 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -34,9 +34,9 @@ use std::fmt::Write;
 use std::ops::Range;
 use std::str;
 
+use crate::doctest;
 use crate::html::highlight;
 use crate::html::toc::TocBuilder;
-use crate::test;
 
 use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, Options, Parser, Tag};
 
@@ -243,7 +243,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'_, 'a, I> {
                 .collect::<Vec<Cow<'_, str>>>()
                 .join("\n");
             let krate = krate.as_ref().map(|s| &**s);
-            let (test, _) = test::make_test(&test, krate, false, &Default::default(), edition);
+            let (test, _) = doctest::make_test(&test, krate, false, &Default::default(), edition);
             let channel = if test.contains("#![feature(") { "&amp;version=nightly" } else { "" };
 
             let edition_string = format!("&amp;edition={}", edition);
@@ -568,7 +568,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for Footnotes<'a, I> {
     }
 }
 
-pub fn find_testable_code<T: test::Tester>(
+pub fn find_testable_code<T: doctest::Tester>(
     doc: &str,
     tests: &mut T,
     error_codes: ErrorCodes,
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index b5e246b5d17a5..8658b39b45578 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -64,13 +64,13 @@ mod docfs;
 mod doctree;
 #[macro_use]
 mod error;
+mod doctest;
 mod fold;
 crate mod formats;
 pub mod html;
 mod json;
 mod markdown;
 mod passes;
-mod test;
 mod theme;
 mod visit_ast;
 mod visit_lib;
@@ -476,7 +476,7 @@ fn main_options(options: config::Options) -> MainResult {
 
     match (options.should_test, options.markdown_input()) {
         (true, true) => return wrap_return(&diag, markdown::test(options)),
-        (true, false) => return test::run(options),
+        (true, false) => return doctest::run(options),
         (false, true) => {
             return wrap_return(
                 &diag,
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index 89d184e35cb06..3a87e1c46a615 100644
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -7,10 +7,10 @@ use rustc_span::edition::Edition;
 use rustc_span::source_map::DUMMY_SP;
 
 use crate::config::{Options, RenderOptions};
+use crate::doctest::{Collector, TestOptions};
 use crate::html::escape::Escape;
 use crate::html::markdown;
 use crate::html::markdown::{find_testable_code, ErrorCodes, IdMap, Markdown, MarkdownWithToc};
-use crate::test::{Collector, TestOptions};
 
 /// Separate any lines at the start of the file that begin with `# ` or `%`.
 fn extract_leading_metadata(s: &str) -> (Vec<&str>, &str) {
diff --git a/src/librustdoc/passes/doc_test_lints.rs b/src/librustdoc/passes/doc_test_lints.rs
index 367f93cfd3893..cbbe86dc433f3 100644
--- a/src/librustdoc/passes/doc_test_lints.rs
+++ b/src/librustdoc/passes/doc_test_lints.rs
@@ -54,7 +54,7 @@ impl Tests {
     }
 }
 
-impl crate::test::Tester for Tests {
+impl crate::doctest::Tester for Tests {
     fn add_test(&mut self, _: String, _: LangString, _: usize) {
         self.found_tests += 1;
     }