summary refs log tree commit diff
path: root/src/test/rustdoc/inline_cross/issue-31948.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-07-26 14:42:30 +0000
committerbors <bors@rust-lang.org>2021-07-26 14:42:30 +0000
commita178d0322ce20e33eac124758e837cbd80a6f633 (patch)
tree049ec0c9a6afed7b3d8e4a87cd7a784621244980 /src/test/rustdoc/inline_cross/issue-31948.rs
parentc8fb0b5be2c95d90036d78a4cffa483005c5daee (diff)
parent55f9bc09a64e845643572fe31c46e8b14d2edb74 (diff)
downloadrust-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/issue-31948.rs')
-rw-r--r--src/test/rustdoc/inline_cross/issue-31948.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/test/rustdoc/inline_cross/issue-31948.rs b/src/test/rustdoc/inline_cross/issue-31948.rs
index 82dcc2d2cc3..7bf4110d32a 100644
--- a/src/test/rustdoc/inline_cross/issue-31948.rs
+++ b/src/test/rustdoc/inline_cross/issue-31948.rs
@@ -5,22 +5,22 @@
 extern crate rustdoc_nonreachable_impls;
 
 // @has issue_31948/struct.Foo.html
-// @has - '//*[@class="impl has-srclink"]//code' 'Bark for'
-// @has - '//*[@class="impl has-srclink"]//code' 'Woof for'
-// @!has - '//*[@class="impl has-srclink"]//code' 'Bar for'
-// @!has - '//*[@class="impl"]//code' 'Qux for'
+// @has - '//*[@class="impl has-srclink"]//h3[@class="code-header in-band"]' 'Bark for'
+// @has - '//*[@class="impl has-srclink"]//h3[@class="code-header in-band"]' 'Woof for'
+// @!has - '//*[@class="impl has-srclink"]//h3[@class="code-header in-band"]' 'Bar for'
+// @!has - '//*[@class="impl"]//h3[@class="code-header in-band"]' 'Qux for'
 pub use rustdoc_nonreachable_impls::Foo;
 
 // @has issue_31948/trait.Bark.html
-// @has - '//code' 'for Foo'
-// @!has - '//code' 'for Wibble'
-// @!has - '//code' 'for Wobble'
+// @has - '//h3[@class="code-header in-band"]' 'for Foo'
+// @!has - '//h3[@class="code-header in-band"]' 'for Wibble'
+// @!has - '//h3[@class="code-header in-band"]' 'for Wobble'
 pub use rustdoc_nonreachable_impls::Bark;
 
 // @has issue_31948/trait.Woof.html
-// @has - '//code' 'for Foo'
-// @!has - '//code' 'for Wibble'
-// @!has - '//code' 'for Wobble'
+// @has - '//h3[@class="code-header in-band"]' 'for Foo'
+// @!has - '//h3[@class="code-header in-band"]' 'for Wibble'
+// @!has - '//h3[@class="code-header in-band"]' 'for Wobble'
 pub use rustdoc_nonreachable_impls::Woof;
 
 // @!has issue_31948/trait.Bar.html