diff options
| author | bors <bors@rust-lang.org> | 2022-10-17 11:33:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-17 11:33:40 +0000 |
| commit | abd77441010d74430be5c34a2e62002e578fa165 (patch) | |
| tree | 9bca7964fdcdbcb3f2088a4fa37124a5582c2e01 /src/test | |
| parent | c19a893f87e70fc1c9bab193c3f9c83d9a9d71d3 (diff) | |
| parent | bb3f60b847ef725124beb097d1b30115bfb3e499 (diff) | |
| download | rust-abd77441010d74430be5c34a2e62002e578fa165.tar.gz rust-abd77441010d74430be5c34a2e62002e578fa165.zip | |
Auto merge of #103145 - matthiaskrgr:rollup-mxwsysv, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #102962 (remote-test-server: Show command line arguments) - #103129 (rustdoc: remove unused `.sub-logo-container` DOM on non-source pages) - #103136 (Fix types in documentation for `Alignment::as_usize` and `Alignmnet::as_nonzero`) - #103139 (Duplicate comment in mod.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rustdoc/logo-class-default.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/logo-class.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/rustdoc/logo-class-default.rs b/src/test/rustdoc/logo-class-default.rs index a7016d227b1..d2d4391997f 100644 --- a/src/test/rustdoc/logo-class-default.rs +++ b/src/test/rustdoc/logo-class-default.rs @@ -1,4 +1,4 @@ // Note: this test is paired with logo-class.rs. // @has logo_class_default/struct.SomeStruct.html '//*[@class="logo-container"]/img[@class="rust-logo"]' '' -// @has logo_class_default/struct.SomeStruct.html '//*[@class="sub-logo-container"]/img[@class="rust-logo"]' '' +// @has src/logo_class_default/logo-class-default.rs.html '//*[@class="sub-logo-container"]/img[@class="rust-logo"]' '' pub struct SomeStruct; diff --git a/src/test/rustdoc/logo-class.rs b/src/test/rustdoc/logo-class.rs index f071f356a6d..d3aa446dab9 100644 --- a/src/test/rustdoc/logo-class.rs +++ b/src/test/rustdoc/logo-class.rs @@ -5,6 +5,6 @@ // @has logo_class/struct.SomeStruct.html '//*[@class="logo-container"]/img[@src="https://raw.githubusercontent.com/sagebind/isahc/master/media/isahc.svg.png"]' '' // @!has logo_class/struct.SomeStruct.html '//*[@class="logo-container"]/img[@class="rust-logo"]' '' // -// @has logo_class/struct.SomeStruct.html '//*[@class="sub-logo-container"]/img[@src="https://raw.githubusercontent.com/sagebind/isahc/master/media/isahc.svg.png"]' '' -// @!has logo_class/struct.SomeStruct.html '//*[@class="sub-logo-container"]/img[@class="rust-logo"]' '' +// @has src/logo_class/logo-class.rs.html '//*[@class="sub-logo-container"]/img[@src="https://raw.githubusercontent.com/sagebind/isahc/master/media/isahc.svg.png"]' '' +// @!has src/logo_class/logo-class.rs.html '//*[@class="sub-logo-container"]/img[@class="rust-logo"]' '' pub struct SomeStruct; |