diff options
| author | bors <bors@rust-lang.org> | 2021-11-23 00:09:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-23 00:09:48 +0000 |
| commit | 8d0c79d26995a973c6f33c32ffb0c827d78bb213 (patch) | |
| tree | a9ee27374b362f878b270d0f5737ecb96e66e2f2 | |
| parent | 936f2600b6c903b04387f74ed5cbce88bb06d243 (diff) | |
| parent | c82f4f66e887fc83296f82e4713fba8f3253b497 (diff) | |
| download | rust-8d0c79d26995a973c6f33c32ffb0c827d78bb213.tar.gz rust-8d0c79d26995a973c6f33c32ffb0c827d78bb213.zip | |
Auto merge of #91145 - matthiaskrgr:rollup-91g8z8i, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #91102 (Set color for <a> in a more straightforward way.) - #91143 (Update books) - #91144 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | Cargo.lock | 8 | ||||
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/embedded-book | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/ayu.css | 17 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/dark.css | 23 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/light.css | 23 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/anchors.goml | 17 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/rustdoc-gui/tester.js | 8 |
14 files changed, 64 insertions, 36 deletions
diff --git a/Cargo.lock b/Cargo.lock index 28b922cf913..51ed441d0db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -888,9 +888,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877cc2f9b8367e32b6dabb9d581557e651cb3aa693a37f8679091bbf42687d5d" +checksum = "1bc6d233563261f8db6ffb83bbaad5a73837a6e6b28868e926337ebbdece0be3" dependencies = [ "curl-sys", "libc", @@ -903,9 +903,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.50+curl-7.79.1" +version = "0.4.51+curl-7.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4856b76919dd599f31236bb18db5f5bd36e2ce131e64f857ca5c259665b76171" +checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20" dependencies = [ "cc", "libc", diff --git a/src/doc/book b/src/doc/book -Subproject 5c5dbc5b196c9564422b3193264f3288d2a051c +Subproject a5e0c5b2c5f9054be3b961aea2c7edfeea591de diff --git a/src/doc/edition-guide b/src/doc/edition-guide -Subproject 27f4a84d3852e9416cae5861254fa53a825c56b +Subproject 8e0ec8c77d8b28b86159fdee9d33a758225ecf9 diff --git a/src/doc/embedded-book b/src/doc/embedded-book -Subproject 51739471276b1776dea27cf562b974ef07e2468 +Subproject 8c395bdd8073deb20ca67e1ed4b14a3a7e315a3 diff --git a/src/doc/reference b/src/doc/reference -Subproject a01d151a7250a540a9cb7ccce5956f020c677c2 +Subproject c0f222da23568477155991d391c9ce918e38135 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject e9d45342d7a6c1def4731f1782d87ea317ba30c +Subproject 43f82530210b83cf888282b207ed13d5893da9b diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject 196ef69aa68f2cef44f37566ee7db37daf00301 +Subproject a2fc9635029c04e692474965a6606f8e286d539 diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 400ed0a48ce..27f9c183b8e 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1078,10 +1078,6 @@ a.test-arrow:hover{ text-decoration: none; } -.section-header a { - color: inherit; -} - .code-attribute { font-weight: 300; } diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 91ede47c156..85fb34b3959 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -214,18 +214,23 @@ nav.main .separator { border: 1px solid #5c6773; } a { + color: #39AFD7; +} +a.srclink, +a#toggle-all-docs, +#source-sidebar a, +pre.rust a, +.sidebar a, +.in-band a { color: #c5c5c5; } +.search-results a { + color: #0096cf; +} body.source .example-wrap pre.rust a { background: #333; } -.docblock:not(.item-decl) a:not(.srclink):not(.test-arrow), -.docblock-short a:not(.srclink):not(.test-arrow), .item-info a, -#help a { - color: #39AFD7; -} - details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, details.undocumented > summary::before { diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 74a4fe45a3d..5a6c08bafd2 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -174,22 +174,27 @@ nav.main .current { nav.main .separator { border-color: #eee; } + a { - color: #ddd; + color: #D2991D; } -body.source .example-wrap pre.rust a { - background: #333; +a.srclink, +a#toggle-all-docs, +#source-sidebar a, +pre.rust a, +.sidebar a, +.in-band a { + color: #ddd; } - -.docblock:not(.item-decl) a:not(.srclink):not(.test-arrow), -.docblock-short a:not(.srclink):not(.test-arrow), .item-info a, -#help a { - color: #D2991D; +.search-results a { + color: #ddd; } - a.test-arrow { color: #dedede; } +body.source .example-wrap pre.rust a { + background: #333; +} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 6df137e3914..05f12fc365d 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -169,22 +169,27 @@ nav.main .current { nav.main .separator { border: 1px solid #000; } + a { - color: #000; + color: #3873AD; } -body.source .example-wrap pre.rust a { - background: #eee; +a.srclink, +a#toggle-all-docs, +#source-sidebar a, +pre.rust a, +.sidebar a, +.in-band a { + color: #000; } - -.docblock:not(.item-decl) a:not(.srclink):not(.test-arrow), -.docblock-short a:not(.srclink):not(.test-arrow), .item-info a, -#help a { - color: #3873AD; +.search-results a { + color: initial; } - a.test-arrow { color: #f5f5f5; } +body.source .example-wrap pre.rust a { + background: #eee; +} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml new file mode 100644 index 00000000000..6953009604c --- /dev/null +++ b/src/test/rustdoc-gui/anchors.goml @@ -0,0 +1,17 @@ +goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html + +// Set the theme to light. +local-storage: {"rustdoc-theme": "light", "rustdoc-use-system-theme": "false"} +// We reload the page so the local storage settings are being used. +reload: + +assert-css: ("#toggle-all-docs", {"color": "rgba(0, 0, 0, 0)"}) +assert-css: (".fqn .in-band a:nth-of-type(1)", {"color": "rgba(0, 0, 0, 0)"}) +assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgba(0, 0, 0, 0)"}) +assert-css: (".srclink", {"color": "rgba(0, 0, 0, 0)"}) +assert-css: (".srclink", {"color": "rgba(0, 0, 0, 0)"}) + +assert-css: ("#top-doc-prose-title", {"color": "rgba(0, 0, 0, 0)"}) + +assert-css: (".sidebar a", {"color": "rgba(0, 0, 0, 0)"}) +assert-css: (".in-band a", {"color": "rgba(0, 0, 0, 0)"}) diff --git a/src/tools/cargo b/src/tools/cargo -Subproject ad50d0d266213e0cc4f6e526a39d96faae9a384 +Subproject e1fb17631eb1b3665cdbe45b1c186111577ef51 diff --git a/src/tools/rustdoc-gui/tester.js b/src/tools/rustdoc-gui/tester.js index b598c63f52a..0d6a2605d4f 100644 --- a/src/tools/rustdoc-gui/tester.js +++ b/src/tools/rustdoc-gui/tester.js @@ -194,7 +194,7 @@ async function main(argv) { .then(out => { const [output, nb_failures] = out; results[nb_failures === 0 ? "successful" : "failed"].push({ - file_name: file_name, + file_name: testPath, output: output, }); if (nb_failures > 0) { @@ -206,7 +206,7 @@ async function main(argv) { }) .catch(err => { results.errored.push({ - file_name: file_name, + file_name: testPath + file_name, output: err, }); status_bar.erroneous(); @@ -239,7 +239,7 @@ async function main(argv) { console.log(""); results.failed.sort(by_filename); results.failed.forEach(r => { - console.log(r.output); + console.log(r.file_name, r.output); }); } if (results.errored.length > 0) { @@ -247,7 +247,7 @@ async function main(argv) { // print run errors on the bottom so developers see them better results.errored.sort(by_filename); results.errored.forEach(r => { - console.error(r.output); + console.error(r.file_name, r.output); }); } |
