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/issue-25001.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/issue-25001.rs')
| -rw-r--r-- | src/test/rustdoc/issue-25001.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/rustdoc/issue-25001.rs b/src/test/rustdoc/issue-25001.rs index e53cf645135..c97b35adaf2 100644 --- a/src/test/rustdoc/issue-25001.rs +++ b/src/test/rustdoc/issue-25001.rs @@ -8,36 +8,36 @@ pub trait Bar { } impl Foo<u8> { - // @has - '//*[@id="method.pass"]//code' 'fn pass()' + // @has - '//*[@id="method.pass"]//h4[@class="code-header"]' 'fn pass()' pub fn pass() {} } impl Foo<u16> { - // @has - '//*[@id="method.pass-1"]//code' 'fn pass() -> usize' + // @has - '//*[@id="method.pass-1"]//h4[@class="code-header"]' 'fn pass() -> usize' pub fn pass() -> usize { 42 } } impl Foo<u32> { - // @has - '//*[@id="method.pass-2"]//code' 'fn pass() -> isize' + // @has - '//*[@id="method.pass-2"]//h4[@class="code-header"]' 'fn pass() -> isize' pub fn pass() -> isize { 42 } } impl<T> Bar for Foo<T> { - // @has - '//*[@id="associatedtype.Item"]//code' 'type Item = T' + // @has - '//*[@id="associatedtype.Item"]//h4[@class="code-header"]' 'type Item = T' type Item=T; - // @has - '//*[@id="method.quux"]//code' 'fn quux(self)' + // @has - '//*[@id="method.quux"]//h4[@class="code-header"]' 'fn quux(self)' fn quux(self) {} } impl<'a, T> Bar for &'a Foo<T> { - // @has - '//*[@id="associatedtype.Item-1"]//code' "type Item = &'a T" + // @has - '//*[@id="associatedtype.Item-1"]//h4[@class="code-header"]' "type Item = &'a T" type Item=&'a T; - // @has - '//*[@id="method.quux-1"]//code' 'fn quux(self)' + // @has - '//*[@id="method.quux-1"]//h4[@class="code-header"]' 'fn quux(self)' fn quux(self) {} } impl<'a, T> Bar for &'a mut Foo<T> { - // @has - '//*[@id="associatedtype.Item-2"]//code' "type Item = &'a mut T" + // @has - '//*[@id="associatedtype.Item-2"]//h4[@class="code-header"]' "type Item = &'a mut T" type Item=&'a mut T; - // @has - '//*[@id="method.quux-2"]//code' 'fn quux(self)' + // @has - '//*[@id="method.quux-2"]//h4[@class="code-header"]' 'fn quux(self)' fn quux(self) {} } |