Skip to content

Commit

Permalink
Auto merge of rust-lang#118105 - notriddle:master, r=fmease
Browse files Browse the repository at this point in the history
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 4)

Follow up

* rust-lang#116214
* rust-lang#116432
* rust-lang#116824
  • Loading branch information
bors committed Nov 24, 2023
2 parents 1fd418f + 4f64ff1 commit eab8c7d
Show file tree
Hide file tree
Showing 32 changed files with 61 additions and 20 deletions.
4 changes: 4 additions & 0 deletions tests/rustdoc-ui/apit-46976.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// check-pass
// https://github.com/rust-lang/rust/issues/46976

pub fn ice(f: impl Fn()) {}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// aux-build:issue-48414.rs
// check-pass

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

// ICE when resolving paths for a trait that linked to another trait, when both were in an external
// crate
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/34423

pub struct Foo;

pub trait Bar {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// aux-build:issue-36031.rs
// check-pass
// build-aux-docs
// ignore-cross-compile

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

#![crate_name = "foo"]

extern crate issue_36031;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// check-pass
// hopefully this doesn't cause an ICE

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

pub fn foo() {
extern crate std;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// check-pass
// This should not ICE

// https://github.com/rust-lang/rust/issues/47639
pub fn test() {
macro_rules! foo {
() => ()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-build:issue-40936.rs
// check-pass
// build-aux-docs

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

#![crate_name = "foo"]

extern crate issue_40936;
1 change: 1 addition & 0 deletions tests/rustdoc/doctest/auxiliary/empty.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// intentionally empty
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// https://github.com/rust-lang/rust/issues/43153

// Test that `include!` in a doc test searches relative to the directory in
// which the test is declared.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// https://github.com/rust-lang/rust/issues/38219

// compile-flags:--test
// should-fail

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// compile-flags:--test

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

//! This is a doc comment
//!
//! ```rust
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// https://github.com/rust-lang/rust/issues/46767
#![crate_name = "foo"]

mod private {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// https://github.com/rust-lang/rust/issues/43701
#![crate_name = "foo"]

pub use std::vec::Vec;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![crate_name = "foo"]

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

mod second {
pub struct SomeTypeWithLongName;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// https://github.com/rust-lang/rust/issues/46766
#![crate_name = "foo"]

pub enum Enum{Variant}
Expand Down
19 changes: 0 additions & 19 deletions tests/rustdoc/issue-43893.rs

This file was deleted.

1 change: 0 additions & 1 deletion tests/rustdoc/issue-46976.rs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#![crate_name = "foo"]

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

use std::vec;

// @has 'foo/index.html'
Expand Down
21 changes: 21 additions & 0 deletions tests/rustdoc/src-links-implementor-43893.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// ignore-cross-compile

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

#![crate_name = "foo"]

pub trait SomeTrait {}
pub struct SomeStruct;

// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#11'
impl SomeTrait for usize {}

// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#14-16'
impl SomeTrait for SomeStruct {
// deliberately multi-line impl
}

pub trait AnotherTrait {}

// @has foo/trait.AnotherTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#21'
impl<T> AnotherTrait for T {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![crate_name = "foo"]

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

pub trait Bar<T, U> {}

// @has 'foo/struct.Foo1.html'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![crate_name = "foo"]

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

pub trait Bar {}

// @has foo/struct.Foo.html '//pre' 'pub struct Foo<T>(pub T) where T: Bar;'
Expand Down

0 comments on commit eab8c7d

Please sign in to comment.