summary refs log tree commit diff
path: root/src/test/rustdoc/visibility.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/visibility.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/visibility.rs')
-rw-r--r--src/test/rustdoc/visibility.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/rustdoc/visibility.rs b/src/test/rustdoc/visibility.rs
index beb638406c4..cd284dad390 100644
--- a/src/test/rustdoc/visibility.rs
+++ b/src/test/rustdoc/visibility.rs
@@ -60,14 +60,14 @@ pub trait PubTrait {
     fn function();
 }
 
-// @has 'foo/struct.FooPublic.html' '//code' 'type Type'
-// @!has 'foo/struct.FooPublic.html' '//code' 'pub type Type'
+// @has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'type Type'
+// @!has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'pub type Type'
 //
-// @has 'foo/struct.FooPublic.html' '//code' 'const CONST: usize'
-// @!has 'foo/struct.FooPublic.html' '//code' 'pub const CONST: usize'
+// @has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'const CONST: usize'
+// @!has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'pub const CONST: usize'
 //
-// @has 'foo/struct.FooPublic.html' '//code' 'fn function()'
-// @!has 'foo/struct.FooPublic.html' '//code' 'pub fn function()'
+// @has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'fn function()'
+// @!has 'foo/struct.FooPublic.html' '//h4[@class="code-header"]' 'pub fn function()'
 
 impl PubTrait for FooPublic {
     type Type = usize;