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/sidebar-items.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/sidebar-items.rs')
| -rw-r--r-- | src/test/rustdoc/sidebar-items.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/rustdoc/sidebar-items.rs b/src/test/rustdoc/sidebar-items.rs index 3ba6dbacc8d..5da660b4df3 100644 --- a/src/test/rustdoc/sidebar-items.rs +++ b/src/test/rustdoc/sidebar-items.rs @@ -1,13 +1,13 @@ #![crate_name = "foo"] // @has foo/trait.Foo.html -// @has - '//*[@class="sidebar-title"][@href="#required-methods"]' 'Required Methods' +// @has - '//*[@class="sidebar-title"]/a[@href="#required-methods"]' 'Required Methods' // @has - '//*[@class="sidebar-links"]/a' 'bar' -// @has - '//*[@class="sidebar-title"][@href="#provided-methods"]' 'Provided Methods' +// @has - '//*[@class="sidebar-title"]/a[@href="#provided-methods"]' 'Provided Methods' // @has - '//*[@class="sidebar-links"]/a' 'foo' -// @has - '//*[@class="sidebar-title"][@href="#associated-const"]' 'Associated Constants' +// @has - '//*[@class="sidebar-title"]/a[@href="#associated-const"]' 'Associated Constants' // @has - '//*[@class="sidebar-links"]/a' 'BAR' -// @has - '//*[@class="sidebar-title"][@href="#associated-types"]' 'Associated Types' +// @has - '//*[@class="sidebar-title"]/a[@href="#associated-types"]' 'Associated Types' // @has - '//*[@class="sidebar-links"]/a' 'Output' pub trait Foo { const BAR: u32 = 0; @@ -18,7 +18,7 @@ pub trait Foo { } // @has foo/struct.Bar.html -// @has - '//*[@class="sidebar-title"][@href="#fields"]' 'Fields' +// @has - '//*[@class="sidebar-title"]/a[@href="#fields"]' 'Fields' // @has - '//*[@class="sidebar-links"]/a[@href="#structfield.f"]' 'f' // @has - '//*[@class="sidebar-links"]/a[@href="#structfield.u"]' 'u' // @!has - '//*[@class="sidebar-links"]/a' 'waza' @@ -29,7 +29,7 @@ pub struct Bar { } // @has foo/enum.En.html -// @has - '//*[@class="sidebar-title"][@href="#variants"]' 'Variants' +// @has - '//*[@class="sidebar-title"]/a[@href="#variants"]' 'Variants' // @has - '//*[@class="sidebar-links"]/a' 'foo' // @has - '//*[@class="sidebar-links"]/a' 'bar' pub enum En { @@ -38,7 +38,7 @@ pub enum En { } // @has foo/union.MyUnion.html -// @has - '//*[@class="sidebar-title"][@href="#fields"]' 'Fields' +// @has - '//*[@class="sidebar-title"]/a[@href="#fields"]' 'Fields' // @has - '//*[@class="sidebar-links"]/a[@href="#structfield.f1"]' 'f1' // @has - '//*[@class="sidebar-links"]/a[@href="#structfield.f2"]' 'f2' // @!has - '//*[@class="sidebar-links"]/a' 'waza' |