Fix warnings in rustdoc HTML tests

Now that compiletest denies warnings in these tests, they need fixing!

Author: camelid

src/test/rustdoc/intra-doc/auxiliary/through-proc-macro-aux.rs renamed to src/test/rustdoc-ui/intra-doc/auxiliary/through-proc-macro-aux.rs

@@ -1,11 +1,17 @@
+// check-pass
 // aux-build:through-proc-macro-aux.rs
 // build-aux-docs
-#![warn(broken_intra_doc_links)]
+
+// Ensure rustdoc doesn't panic on this code.
+
+#![warn(rustdoc::broken_intra_doc_links)]
+
 extern crate some_macros;
 
 #[some_macros::second]
 pub enum Boom {
     /// [Oooops]
+    //~^ WARNING unresolved link to `Oooops`
     Bam,
 }
 

src/test/rustdoc/intra-doc/through-proc-macro.rs renamed to src/test/rustdoc-ui/intra-doc/through-proc-macro.rs

@@ -0,0 +1,15 @@
+warning: unresolved link to `Oooops`
+  --> $DIR/through-proc-macro.rs:13:10
+   |
+LL |     /// [Oooops]
+   |          ^^^^^^ no item named `Oooops` in scope
+   |
+note: the lint level is defined here
+  --> $DIR/through-proc-macro.rs:7:9
+   |
+LL | #![warn(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
+
+warning: 1 warning emitted
+

src/test/rustdoc-ui/intra-doc/through-proc-macro.stderr

@@ -1,4 +1,7 @@
+#![feature(rustdoc_internals)]
+
 #![crate_name = "foo"]
+
 pub use std::fs::File;
 
 // @has 'foo/primitive.i16.html' '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementation'

src/test/rustdoc/auto-impl-primitive.rs

@@ -1,3 +1,5 @@
+#![allow(rustdoc::invalid_rust_codeblocks)]
+
 // @has bad_codeblock_syntax/fn.foo.html
 // @has - '//*[@class="docblock"]' '\_'
 /// ```

src/test/rustdoc/bad-codeblock-syntax.rs

@@ -2,6 +2,8 @@
 // aux-build:source_code.rs
 // build-aux-docs
 
+#![feature(rustdoc_internals)]
+
 #![crate_name = "foo"]
 
 extern crate source_code;
@@ -29,21 +31,20 @@ fn babar() {}
 // @has - '//a/@href' '/struct.String.html'
 // @has - '//a/@href' '/primitive.u32.html'
 // @has - '//a/@href' '/primitive.str.html'
-// @count - '//a[@href="../../src/foo/check-source-code-urls-to-def.rs.html#21"]' 5
+// @count - '//a[@href="../../src/foo/check-source-code-urls-to-def.rs.html#23"]' 5
 // @has - '//a[@href="../../source_code/struct.SourceCode.html"]' 'source_code::SourceCode'
 pub fn foo(a: u32, b: &str, c: String, d: Foo, e: bar::Bar, f: source_code::SourceCode) {
     let x = 12;
     let y: Foo = Foo;
     let z: Bar = bar::Bar { field: Foo };
     babar();
-    // @has - '//a[@href="../../src/foo/check-source-code-urls-to-def.rs.html#24"]' 'hello'
+    // @has - '//a[@href="../../src/foo/check-source-code-urls-to-def.rs.html#26"]' 'hello'
     y.hello();
 }
 
 // @has - '//a[@href="../../src/foo/auxiliary/source-code-bar.rs.html#14-16"]' 'bar::sub::Trait'
 // @has - '//a[@href="../../src/foo/auxiliary/source-code-bar.rs.html#14-16"]' 'Trait'
-pub fn foo2<T: bar::sub::Trait, V: Trait>(t: &T, v: &V, b: bool) {
-}
+pub fn foo2<T: bar::sub::Trait, V: Trait>(t: &T, v: &V, b: bool) {}
 
 // @has - '//a[@href="../../foo/primitive.bool.html"]' 'bool'
 #[doc(primitive = "bool")]

src/test/rustdoc/check-source-code-urls-to-def.rs

@@ -1,3 +1,5 @@
+#![allow(incomplete_features)]
+
 #![feature(adt_const_params)]
 
 #![crate_name = "foo"]
@@ -15,23 +17,23 @@ pub struct VSet<T, const ORDER: Order> {
     inner: Vec<T>,
 }
 
-// @has foo/struct.VSet.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, {Order::Sorted}>'
-impl <T> VSet<T, {Order::Sorted}> {
+// @has foo/struct.VSet.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Sorted }>'
+impl<T> VSet<T, { Order::Sorted }> {
     pub fn new() -> Self {
         Self { inner: Vec::new() }
     }
 }
 
-// @has foo/struct.VSet.html '//div[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, {Order::Unsorted}>'
-impl <T> VSet<T, {Order::Unsorted}> {
+// @has foo/struct.VSet.html '//div[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Unsorted }>'
+impl<T> VSet<T, { Order::Unsorted }> {
     pub fn new() -> Self {
         Self { inner: Vec::new() }
     }
 }
 
 pub struct Escape<const S: &'static str>;
 
-// @has foo/struct.Escape.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl Escape<{ r#"<script>alert("Escape");</script>"# }>'
-impl Escape<{ r#"<script>alert("Escape");</script>"# }> {
+// @has foo/struct.Escape.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl Escape<r#"<script>alert("Escape");</script>"#>'
+impl Escape<r#"<script>alert("Escape");</script>"#> {
     pub fn f() {}
 }

src/test/rustdoc/const-generics/const-impl.rs

@@ -1,4 +1,4 @@
-#![feature(specialization)]
+#![feature(min_specialization)]
 
 // @has default_trait_method/trait.Item.html
 // @has - '//*[@id="tymethod.foo"]' 'fn foo()'

src/test/rustdoc/default-trait-method.rs

@@ -96,6 +96,6 @@ pub fn uses_cfg_target_feature() {
 // @has doc_cfg/fn.multiple_attrs.html \
 //  '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \
 //  'This is supported on x and y and z only.'
-#[doc(inline, cfg(x))]
+#[doc(cfg(x))]
 #[doc(cfg(y), cfg(z))]
 pub fn multiple_attrs() {}

src/test/rustdoc/doc-cfg.rs

@@ -1,4 +1,4 @@
-#![deny(intra_doc_link_resolution_failure)]
+#![deny(rustdoc::broken_intra_doc_links)]
 #![feature(associated_type_defaults)]
 
 pub trait TraitWithDefault {

src/test/rustdoc/intra-doc/associated-defaults.rs

@@ -1,4 +1,4 @@
-#![deny(intra_doc_link_resolution_failure)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 /// [`std::collections::BTreeMap::into_iter`]
 /// [`String::from`] is ambiguous as to which `From` impl

src/test/rustdoc/intra-doc/associated-items.rs

@@ -1,4 +1,4 @@
-#![feature(no_core, lang_items)]
+#![feature(no_core, lang_items, rustdoc_internals)]
 #![no_core]
 #![crate_type="rlib"]
 

src/test/rustdoc/intra-doc/auxiliary/my-core.rs

@@ -1,6 +1,6 @@
 // aux-build:additional_doc.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate my_rand;
 

src/test/rustdoc/intra-doc/cross-crate/additional_doc.rs

@@ -1,5 +1,5 @@
 #![crate_name = "my_rand"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub trait RngCore {}
 /// Rng extends [`RngCore`].

src/test/rustdoc/intra-doc/cross-crate/auxiliary/additional_doc.rs

@@ -1,5 +1,5 @@
 #![crate_name = "hidden_dep"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 #[doc(hidden)]
 pub mod __reexport {

src/test/rustdoc/intra-doc/cross-crate/auxiliary/hidden.rs

@@ -1,5 +1,5 @@
 #![crate_name = "a"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub struct Foo;
 

src/test/rustdoc/intra-doc/cross-crate/auxiliary/intra-doc-basic.rs

@@ -1,5 +1,5 @@
 #![crate_name = "macro_inner"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub struct Foo;
 

src/test/rustdoc/intra-doc/cross-crate/auxiliary/macro_inner.rs

@@ -1,5 +1,5 @@
 #![crate_name = "module_inner"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 /// [SomeType] links to [bar]
 pub struct SomeType;
 pub trait SomeTrait {}

src/test/rustdoc/intra-doc/cross-crate/auxiliary/module.rs

@@ -1,5 +1,5 @@
 #![crate_name = "a"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub mod bar {
    pub struct Bar;

src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-inner.rs

@@ -1,5 +1,5 @@
 #![crate_name = "bar"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub trait Foo {
     /// [`Bar`] [`Baz`]

src/test/rustdoc/intra-doc/cross-crate/auxiliary/submodule-outer.rs

@@ -1,6 +1,6 @@
 // aux-build:intra-doc-basic.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 // from https://github.com/rust-lang/rust/issues/65983
 extern crate a;

src/test/rustdoc/intra-doc/cross-crate/basic.rs

@@ -1,6 +1,6 @@
 // aux-build:hidden.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 // tests https://github.com/rust-lang/rust/issues/73363
 

src/test/rustdoc/intra-doc/cross-crate/hidden.rs

@@ -1,7 +1,7 @@
 // aux-build:macro_inner.rs
 // aux-build:proc_macro.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 extern crate macro_inner;
 extern crate proc_macro_inner;
 

src/test/rustdoc/intra-doc/cross-crate/macro.rs

@@ -1,7 +1,7 @@
 // outer.rs
 // aux-build: module.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 extern crate module_inner;
 // @has 'module/bar/index.html' '//a[@href="../../module_inner/trait.SomeTrait.html"]' 'SomeTrait'
 // @has 'module/bar/index.html' '//a[@href="../../module_inner/struct.SomeType.html"]' 'SomeType'

src/test/rustdoc/intra-doc/cross-crate/module.rs

@@ -1,6 +1,6 @@
 // aux-build:submodule-inner.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate a;
 

src/test/rustdoc/intra-doc/cross-crate/submodule-inner.rs

@@ -1,6 +1,6 @@
 // aux-build:submodule-outer.rs
 // edition:2018
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate bar as bar_;
 

src/test/rustdoc/intra-doc/cross-crate/submodule-outer.rs

@@ -1,6 +1,6 @@
 // aux-build:traits.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate inner;
 use inner::SomeTrait;

src/test/rustdoc/intra-doc/cross-crate/traits.rs

@@ -1,4 +1,4 @@
-#![deny(intra_doc_link_resolution_failure)]
+#![deny(rustdoc::broken_intra_doc_links)]
 // first try backticks
 /// Trait: [`trait@Name`], fn: [`fn@Name`], [`Name`][`macro@Name`]
 // @has disambiguators_removed/struct.AtDisambiguator.html

src/test/rustdoc/intra-doc/disambiguators-removed.rs

@@ -1,3 +1,5 @@
+#![allow(rustdoc::broken_intra_doc_links)]
+
 //! Email me at <[email protected]>.
 //! Email me at <[email protected]>.
 //! Email me at <hello@localhost> (this warns but will still become a link).

src/test/rustdoc/intra-doc/email-address.rs

@@ -4,6 +4,6 @@
 // though they would never actually get displayed. This tripped intra-doc-link resolution failures,
 // for items that aren't under our control, and not actually getting documented!
 
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate inner;

src/test/rustdoc/intra-doc/extern-crate.rs

@@ -2,7 +2,7 @@
 // ignore-cross-compile
 
 #![crate_name = "outer"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 // using a trait that has intra-doc links on it from another crate (whether re-exporting or just
 // implementing it) used to give spurious resolution failure warnings

src/test/rustdoc/intra-doc/external-traits.rs

@@ -1,6 +1,6 @@
 // we need to make sure that intra-doc links on trait impls get resolved in the right scope
 
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub mod inner {
     pub struct SomethingOutOfScope;

src/test/rustdoc/intra-doc/in-bodies.rs

@@ -1,5 +1,5 @@
 #![crate_name = "foo"]
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 pub enum Foo {
     Bar {
         abc: i32,

src/test/rustdoc/intra-doc/issue-82209.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 #![feature(intra_doc_pointers)]
 
 pub use std::*;

src/test/rustdoc/intra-doc/libstd-re-export.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 
 pub fn foo() {

src/test/rustdoc/intra-doc/mod-ambiguity.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 //! [i32::MAX]
 // @has prim_assoc/index.html '//a[@href="{{channel}}/std/primitive.i32.html#associatedconstant.MAX"]' "i32::MAX"

src/test/rustdoc/intra-doc/prim-assoc.rs

@@ -3,7 +3,7 @@
 // ignore-cross-compile
 // only-linux
 
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 #![feature(no_core, lang_items)]
 #![no_core]
 #![crate_type = "rlib"]

src/test/rustdoc/intra-doc/prim-methods-external-core.rs

@@ -1,5 +1,5 @@
-#![deny(broken_intra_doc_links)]
-#![feature(no_core, lang_items)]
+#![deny(rustdoc::broken_intra_doc_links)]
+#![feature(no_core, lang_items, rustdoc_internals)]
 #![no_core]
 #![crate_type = "rlib"]
 

src/test/rustdoc/intra-doc/prim-methods-local.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 
 // @has prim_methods/index.html

src/test/rustdoc/intra-doc/prim-methods.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 pub mod char {
     /// [char]

src/test/rustdoc/intra-doc/prim-precedence.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 // @has primitive_disambiguators/index.html
 // @has - '//a/@href' '{{channel}}/std/primitive.str.html#method.trim'
 //! [str::trim()]

src/test/rustdoc/intra-doc/primitive-disambiguators.rs

@@ -1,4 +1,4 @@
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 
 // @has primitive_non_default_impl/fn.str_methods.html

src/test/rustdoc/intra-doc/primitive-non-default-impl.rs

@@ -2,7 +2,7 @@
 // These failures were legitimate, but not truly relevant - the docs in question couldn't be
 // checked for accuracy anyway.
 
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 /// ooh, i'm a [rebel] just for kicks
 struct SomeStruct;

src/test/rustdoc/intra-doc/private-failures-ignored.rs

@@ -1,8 +1,11 @@
-#![crate_name = "private"]
 // compile-flags: --document-private-items
 
 // make sure to update `rustdoc-ui/intra-doc/private.rs` if you update this file
 
+#![allow(rustdoc::private_intra_doc_links)]
+
+#![crate_name = "private"]
+
 /// docs [DontDocMe] [DontDocMe::f] [DontDocMe::x]
 // @has private/struct.DocMe.html '//*a[@href="struct.DontDocMe.html"]' 'DontDocMe'
 // @has private/struct.DocMe.html '//*a[@href="struct.DontDocMe.html#method.f"]' 'DontDocMe::f'

src/test/rustdoc/intra-doc/private.rs

@@ -1,6 +1,6 @@
 // aux-build:proc-macro-macro.rs
 // build-aux-docs
-#![deny(broken_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
 
 extern crate proc_macro_macro;