Move rustdoc UI tests into a subdirectory

This also adds a little leeway to the test limit.

18 files changed, 4 insertions, 1 deletions

diff --git a/src/test/ui/lex-bare-cr-nondoc-comment.rs b/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs
index 5b528d6e1e1..5b528d6e1e1 100644
--- a/src/test/ui/lex-bare-cr-nondoc-comment.rs
+++ b/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs
diff --git a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs
index 802be7f5afb..802be7f5afb 100644
--- a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs
diff --git a/src/test/ui/rustdoc/README.md b/src/test/ui/rustdoc/README.md
new file mode 100644
index 00000000000..1c98ab038ab
--- /dev/null
+++ b/src/test/ui/rustdoc/README.md
@@ -0,0 +1,3 @@
+This directory is for tests that have to do with rustdoc, but test the behavior
+of rustc. For example, rustc should not warn that an attribute rustdoc uses is
+unknown.
diff --git a/src/test/ui/cfg-rustdoc.rs b/src/test/ui/rustdoc/cfg-rustdoc.rs
index dd8e1ed97c4..dd8e1ed97c4 100644
--- a/src/test/ui/cfg-rustdoc.rs
+++ b/src/test/ui/rustdoc/cfg-rustdoc.rs
diff --git a/src/test/ui/cfg-rustdoc.stderr b/src/test/ui/rustdoc/cfg-rustdoc.stderr
index c687d186989..c687d186989 100644
--- a/src/test/ui/cfg-rustdoc.stderr
+++ b/src/test/ui/rustdoc/cfg-rustdoc.stderr
diff --git a/src/test/ui/check-doc-alias-attr-location.rs b/src/test/ui/rustdoc/check-doc-alias-attr-location.rs
index 007d2ae6506..007d2ae6506 100644
--- a/src/test/ui/check-doc-alias-attr-location.rs
+++ b/src/test/ui/rustdoc/check-doc-alias-attr-location.rs
diff --git a/src/test/ui/check-doc-alias-attr-location.stderr b/src/test/ui/rustdoc/check-doc-alias-attr-location.stderr
index a66e9939eaf..a66e9939eaf 100644
--- a/src/test/ui/check-doc-alias-attr-location.stderr
+++ b/src/test/ui/rustdoc/check-doc-alias-attr-location.stderr
diff --git a/src/test/ui/check-doc-alias-attr.rs b/src/test/ui/rustdoc/check-doc-alias-attr.rs
index 912e35f9165..912e35f9165 100644
--- a/src/test/ui/check-doc-alias-attr.rs
+++ b/src/test/ui/rustdoc/check-doc-alias-attr.rs
diff --git a/src/test/ui/check-doc-alias-attr.stderr b/src/test/ui/rustdoc/check-doc-alias-attr.stderr
index 1c7fc83bb8d..1c7fc83bb8d 100644
--- a/src/test/ui/check-doc-alias-attr.stderr
+++ b/src/test/ui/rustdoc/check-doc-alias-attr.stderr
diff --git a/src/test/ui/doc-alias-crate-level.rs b/src/test/ui/rustdoc/doc-alias-crate-level.rs
index c7783aae5ea..c7783aae5ea 100644
--- a/src/test/ui/doc-alias-crate-level.rs
+++ b/src/test/ui/rustdoc/doc-alias-crate-level.rs
diff --git a/src/test/ui/doc-alias-crate-level.stderr b/src/test/ui/rustdoc/doc-alias-crate-level.stderr
index c0467514ae1..c0467514ae1 100644
--- a/src/test/ui/doc-alias-crate-level.stderr
+++ b/src/test/ui/rustdoc/doc-alias-crate-level.stderr
diff --git a/src/test/ui/doc-alias-same-name.rs b/src/test/ui/rustdoc/doc-alias-same-name.rs
index da97c267618..da97c267618 100644
--- a/src/test/ui/doc-alias-same-name.rs
+++ b/src/test/ui/rustdoc/doc-alias-same-name.rs
diff --git a/src/test/ui/doc-alias-same-name.stderr b/src/test/ui/rustdoc/doc-alias-same-name.stderr
index 5ba09a2eae1..5ba09a2eae1 100644
--- a/src/test/ui/doc-alias-same-name.stderr
+++ b/src/test/ui/rustdoc/doc-alias-same-name.stderr
diff --git a/src/test/ui/doc_keyword.rs b/src/test/ui/rustdoc/doc_keyword.rs
index 4c72e7e9684..4c72e7e9684 100644
--- a/src/test/ui/doc_keyword.rs
+++ b/src/test/ui/rustdoc/doc_keyword.rs
diff --git a/src/test/ui/doc_keyword.stderr b/src/test/ui/rustdoc/doc_keyword.stderr
index d72a876163e..d72a876163e 100644
--- a/src/test/ui/doc_keyword.stderr
+++ b/src/test/ui/rustdoc/doc_keyword.stderr
diff --git a/src/test/ui/unterminated-doc-comment.rs b/src/test/ui/rustdoc/unterminated-doc-comment.rs
index 82546fe73da..82546fe73da 100644
--- a/src/test/ui/unterminated-doc-comment.rs
+++ b/src/test/ui/rustdoc/unterminated-doc-comment.rs
diff --git a/src/test/ui/unterminated-doc-comment.stderr b/src/test/ui/rustdoc/unterminated-doc-comment.stderr
index 2d5e537973e..2d5e537973e 100644
--- a/src/test/ui/unterminated-doc-comment.stderr
+++ b/src/test/ui/rustdoc/unterminated-doc-comment.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index c69bdca7611..3374a8c9b73 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,7 +7,7 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1418;
+const ROOT_ENTRY_LIMIT: usize = 1408;
 const ISSUES_ENTRY_LIMIT: usize = 2565;
 
 fn check_entries(path: &Path, bad: &mut bool) {