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/inline_cross/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/inline_cross/impl_trait.rs')
| -rw-r--r-- | src/test/rustdoc/inline_cross/impl_trait.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc/inline_cross/impl_trait.rs b/src/test/rustdoc/inline_cross/impl_trait.rs index a2adc0e63c9..ef615472b0e 100644 --- a/src/test/rustdoc/inline_cross/impl_trait.rs +++ b/src/test/rustdoc/inline_cross/impl_trait.rs @@ -31,8 +31,8 @@ pub use impl_trait_aux::func4; pub use impl_trait_aux::async_fn; // @has impl_trait/struct.Foo.html -// @has - '//*[@id="method.method"]//code' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)" -// @!has - '//*[@id="method.method"]//code' 'where' +// @has - '//*[@id="method.method"]//h4[@class="code-header"]' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)" +// @!has - '//*[@id="method.method"]//h4[@class="code-header"]' 'where' pub use impl_trait_aux::Foo; // @has impl_trait/struct.Bar.html |