Skip to content

Commit

Permalink
Unrolled build for rust-lang#127671
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127671 - notriddle:notriddle/issue-d, r=Mark-Simulacrum

rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 8)

Follow up

* rust-lang#116214
* rust-lang#116432
* rust-lang#116824
* rust-lang#118105
* rust-lang#119561
* rust-lang#123574
* rust-lang#125382

As always, it's easier to review the commits one at a time. Don't use the Files Changed tab. It's confusing.
  • Loading branch information
rust-timer authored Jul 14, 2024
2 parents 4cd8dc6 + 42ee400 commit 668b456
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//@ check-pass
// https://github.com/rust-lang/rust/issues/102154

trait A<Y, N> {
type B;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//@ check-pass
// https://github.com/rust-lang/rust/issues/100620

pub trait Bar<S> {}

pub trait Qux<T> {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// Check that this isn't an ICE
//@ should-fail

// https://github.com/rust-lang/rust/issues/100241

mod foo {
pub use inner::S;
//~^ ERROR unresolved imports `inner`, `foo::S`
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
//@ ignore-cross-compile
// This is the version where a non-compiler-internal crate inlines a compiler-internal one.
// In this case, the item shouldn't be documented, because regular users can't get at it.
// https://github.com/rust-lang/rust/issues/106421
#![crate_name="bar"]

extern crate foo;

//@ !has issue_106421_not_internal/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
//@ !has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
pub use foo::FatalError;
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//@ aux-build:issue-106421-force-unstable.rs
//@ ignore-cross-compile
//@ compile-flags: -Zforce-unstable-if-unmarked
// https://github.com/rust-lang/rust/issues/106421
#![crate_name="bar"]

extern crate foo;

//@ has issue_106421/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
//@ has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
pub use foo::FatalError;
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// https://github.com/rust-lang/rust/issues/105952
#![crate_name = "foo"]

#![feature(associated_const_equality)]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ build-aux-docs
//@ ignore-cross-compile

// https://github.com/rust-lang/rust/issues/100204
#![crate_name="second"]

extern crate first;
Expand Down
14 changes: 0 additions & 14 deletions tests/rustdoc/issue-106142.rs

This file was deleted.

File renamed without changes.
17 changes: 17 additions & 0 deletions tests/rustdoc/macro-rules-broken-intra-doc-106142.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// https://github.com/rust-lang/rust/issues/106142
#![crate_name="foo"]

//@ has 'foo/a/index.html'
//@ count 'foo/a/index.html' '//ul[@class="item-table"]//li//a' 1

#![allow(rustdoc::broken_intra_doc_links)]

pub mod a {
/// [`m`]
pub fn f() {}

#[macro_export]
macro_rules! m {
() => {};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ build-aux-docs
//@ ignore-cross-compile

// https://github.com/rust-lang/rust/issues/99734
#![crate_name = "foo"]

#[macro_use]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ build-aux-docs
//@ ignore-cross-compile

// https://github.com/rust-lang/rust/issues/99221
#![crate_name = "foo"]

#[macro_use]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ build-aux-docs
//@ ignore-cross-compile

// https://github.com/rust-lang/rust/issues/99734
#![crate_name = "foo"]

#[macro_use]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//@ build-aux-docs
//@ ignore-cross-compile

// https://github.com/rust-lang/rust/issues/99221
#![crate_name = "foo"]

#[macro_use]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
// https://github.com/rust-lang/rust/issues/105735

#![crate_name = "foo"]
#![no_std]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
// https://github.com/rust-lang/rust/issues/105735

#![crate_name = "foo"]
#![no_std]
Expand Down
File renamed without changes.

0 comments on commit 668b456

Please sign in to comment.