diff options
| author | bors <bors@rust-lang.org> | 2021-07-26 14:42:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-26 14:42:30 +0000 |
| commit | a178d0322ce20e33eac124758e837cbd80a6f633 (patch) | |
| tree | 049ec0c9a6afed7b3d8e4a87cd7a784621244980 /src/test/rustdoc/extern-impl-trait.rs | |
| parent | c8fb0b5be2c95d90036d78a4cffa483005c5daee (diff) | |
| parent | 55f9bc09a64e845643572fe31c46e8b14d2edb74 (diff) | |
| download | rust-1.54.0.tar.gz rust-1.54.0.zip | |
Auto merge of #87476 - pietroalbini:stable-next, r=Mark-Simulacrum 1.54.0
Prepare 1.54.0 release This PR builds the stable artifacts for the 1.54.0 release. Backports included: * https://github.com/rust-lang/rust/pull/86696 * #87167 * #87210 I was *not* able to cherry-pick https://github.com/rust-lang/rust/pull/87390 as that didn't apply cleanly to the stable branch. `@GuillaumeGomez` `@notriddle` could it be possible to get a PR targeting `stable` backporting that fix? Also, this **enables** incremental compilation on the stable channel. r? `@Mark-Simulacrum` cc `@rust-lang/release`
Diffstat (limited to 'src/test/rustdoc/extern-impl-trait.rs')
| -rw-r--r-- | src/test/rustdoc/extern-impl-trait.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc/extern-impl-trait.rs b/src/test/rustdoc/extern-impl-trait.rs index 58bd650feb4..8ab026afd1b 100644 --- a/src/test/rustdoc/extern-impl-trait.rs +++ b/src/test/rustdoc/extern-impl-trait.rs @@ -4,8 +4,8 @@ extern crate extern_impl_trait; -// @has 'foo/struct.X.html' '//code' "impl Foo<Associated = ()> + 'a" +// @has 'foo/struct.X.html' '//h4[@class="code-header"]' "impl Foo<Associated = ()> + 'a" pub use extern_impl_trait::X; -// @has 'foo/struct.Y.html' '//code' "impl ?Sized + Foo<Associated = ()> + 'a" +// @has 'foo/struct.Y.html' '//h4[@class="code-header"]' "impl ?Sized + Foo<Associated = ()> + 'a" pub use extern_impl_trait::Y; |