Rollup of 6 pull requests by GuillaumeGomez · Pull Request #87133 · rust-lang/rust

GuillaumeGomez · 2021-07-14T17:53:42Z

Successful merges:

expand: Support helper attributes for built-in derive macros #87027 (expand: Support helper attributes for built-in derive macros)
Fix codeblocks overflow #87056 (Fix codeblocks overflow)
Shrink the CrateStore dynamic interface. #87117 (Shrink the CrateStore dynamic interface.)
rustdoc: Remove unnecessary extern crate aliases #87120 (rustdoc: Remove unnecessary extern crate aliases)
Fix Ayu theme <code> color #87125 (Fix Ayu theme <code> color)
Update browser-ui-test package version #87130 (Update browser-ui-test package version)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This is leftover from when `doctest` used to be called `test`. Remove it now, it's unnecessary and makes the code harder to read.

expand: Support helper attributes for built-in derive macros This is needed for rust-lang#86735 (derive macro `Default` should have a helper attribute `default`). With this PR we can specify helper attributes for built-in derives using syntax `#[rustc_builtin_macro(MacroName, attributes(attr1, attr2, ...))]` which mirrors equivalent syntax for proc macros `#[proc_macro_derive(MacroName, attributes(attr1, attr2, ...))]`. Otherwise expansion infra was already ready for this. The attribute parsing code is shared between proc macro derives and built-in macros (`fn parse_macro_name_and_helper_attrs`).

…low, r=notriddle Fix codeblocks overflow Fixesrust-lang#87043. Instead of completely relying on `pulldown-cmark` (and its potential changes), I decided to move the generation of codeblocks HTML directly in rustdoc so we can unify the DOM and the CSS classes. r? `@Nemo157`

Shrink the CrateStore dynamic interface. The information is either accessible through queries or by crates which already depend on rustc_metadata.

rustdoc: Remove unnecessary `extern crate` aliases

…triddle Fix Ayu theme <code> color Fixesrust-lang#87072 (the second regression). r? `@notriddle`

…st, r=Mark-Simulacrum Update browser-ui-test package version It adds a check to prevent to have empty CSS values in `assert-css` command. r? `@Mark-Simulacrum`

GuillaumeGomez · 2021-07-14T17:54:16Z

@bors: r+ p=6 rollup=never

bors · 2021-07-14T17:54:17Z

📌 Commit ac6672b has been approved by GuillaumeGomez

bors · 2021-07-14T17:59:35Z

⌛ Testing commit ac6672b with merge 10939d3bd175c9aaddc5feb5512e1bd1958adb68...

rust-log-analyzer · 2021-07-14T18:05:37Z

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

 SCCACHE_BUCKET: rust-lang-ci-sccache2
TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
CACHE_DOMAIN: ci-caches.rust-lang.org
EXTRA_VARIABLES: {
"CI_ONLY_WHEN_SUBMODULES_CHANGED": 1
##[endgroup]
adding extra environment variable CI_ONLY_WHEN_SUBMODULES_CHANGED
linux builder detected, using docker to run the build
##[group]Run src/ci/scripts/should-skip-this.sh
---
IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
* branch master -> FETCH_HEAD
Searching for toolstate changes between ee5ed4a88d6a869cdb152829ed697d6459650db3 and 4ac31063ff02c05793ae8dfea5be332d5806fd95
Executing the job since rustdoc was updated
src/ci/scripts/verify-channel.sh
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
env:
CI_JOB_NAME: x86_64-gnu-tools
---
Successfully built cd9e59a8c518
Successfully tagged rust-ci:latest
Built container sha256:cd9e59a8c5184e8bd4f912ac5433fd39575ca643464407f9cacfbe978ce6da97
Uploading finished image to https://ci-caches.rust-lang.org/docker/aebd8caf54dd5d7b5b1092ca66f2cea9bc9dd285021d1c989b7a21ef3404ac6ce78ee86f7c7940a5d26725945c879b9e4a9288e07a69eb9864c1ee345fb06d65
upload failed: - to s3://rust-lang-ci-sccache2/docker/aebd8caf54dd5d7b5b1092ca66f2cea9bc9dd285021d1c989b7a21ef3404ac6ce78ee86f7c7940a5d26725945c879b9e4a9288e07a69eb9864c1ee345fb06d65 Unable to locate credentials
* branch master -> FETCH_HEAD
warning: 969c145f96045a156a5776a8f4407e87df5a07b6:.gitmodules, multiple configurations found for 'submodule.src/rust-installer.path'. Skipping second one!
warning: 969c145f96045a156a5776a8f4407e87df5a07b6:.gitmodules, multiple configurations found for 'submodule.src/rust-installer.url'. Skipping second one!
warning: 969c145f96045a156a5776a8f4407e87df5a07b6:.gitmodules, multiple configurations found for 'submodule.src/doc/nomicon.path'. Skipping second one!
---
From https://github.com/rust-lang/miri
* branch 062cf07d98822beb4c5b1132f47b4397275f403a -> FETCH_HEAD
* branch 06758c48bd7a77bb5aa43fc50cf344540ba5afef -> FETCH_HEAD
* branch dd7f545a69e4b720407e458bf4ade0b207bbf9ee -> FETCH_HEAD
fatal: remote error: upload-pack: not our ref 9ad6e5b8f68ee4bcd85886e50b8b0a70cbb91a52
Errors during submodule fetch:
##[error]Process completed with exit code 1.
Post job cleanup.

GuillaumeGomez · 2021-07-14T18:09:16Z

@bors retry

bors · 2021-07-14T18:09:26Z

⌛ Testing commit ac6672b with merge 085b7adca038fa545d3b0efc217dc74504fd09bd...

rust-log-analyzer · 2021-07-14T18:12:22Z

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

GuillaumeGomez · 2021-07-14T18:31:44Z

@bors retry

bors · 2021-07-14T18:31:54Z

⌛ Testing commit ac6672b with merge 7f342a73c5652890f3aaf37ba97fbaa84362d469...

rust-log-analyzer · 2021-07-14T18:34:18Z

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

GuillaumeGomez · 2021-07-14T18:36:40Z

@bors retry

bors · 2021-07-14T18:36:49Z

⌛ Testing commit ac6672b with merge e87188c...

rust-log-analyzer · 2021-07-14T18:52:30Z

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2021-07-14T21:17:30Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing e87188c to master...

petrochenkovand others added 15 commits July 13, 2021 21:59

expand: Support helper attributes for built-in derive macros
6c9ea1e

Remove renaming of test crate
78eae0f
This is leftover from when `doctest` used to be called `test`. Remove it now, it's unnecessary and makes the code harder to read.

Remove useless alias from rustc_span to itself
1006175

Fix display for non-rust code blocks
0ef8988

Add test for codeblocks overflow
7593bfe

Fix color for <code> which are not in doc blocks
749cd8f

Add GUI test to check ayu <code> colors
46b4b37

Update browser-ui-test package version
56abf71

Shrink the CrateStore dynamic interface.
3fba5a4

Rollup merge ofrust-lang#87117- cjgillot:cstore, r=petrochenkov
40155f5
Shrink the CrateStore dynamic interface. The information is either accessible through queries or by crates which already depend on rustc_metadata.

Rollup merge ofrust-lang#87120- jyn514:rustdoc-cleanup, r=CraftSpider
e932ba3
rustdoc: Remove unnecessary `extern crate` aliases

Rollup merge ofrust-lang#87125- GuillaumeGomez:ayu-code-color, r=no…
e0d72d0
…triddle Fix Ayu theme <code> color Fixesrust-lang#87072 (the second regression). r? `@notriddle`

Rollup merge ofrust-lang#87130- GuillaumeGomez:update-browser-ui-te…
ac6672b
…st, r=Mark-Simulacrum Update browser-ui-test package version It adds a check to prevent to have empty CSS values in `assert-css` command. r? `@Mark-Simulacrum`

rustbot added the rollup A PR which is a rollup label Jul 14, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 14, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2021

bors merged commit e87188c into rust-lang:masterJul 14, 2021

rustbot added this to the 1.55.0 milestone Jul 14, 2021

bors mentioned this pull request Jul 14, 2021
Generate links to definition in rustdoc source code pages #84176
Merged

GuillaumeGomez deleted the rollup-pfz9jbk branch July 14, 2021 21:22

This was referenced Jul 14, 2021
Add --nocapture option to rustdoc #86230
Merged
Move OnDiskCache to rustc_query_impl. #86698
Merged

albertlarsan68 mentioned this pull request Dec 13, 2022
Rustdoc does not format ASCII art containing ### at the start of a line correctly #105527
Closed

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Jul 14, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

rust-log-analyzer commented Jul 14, 2021

Uh oh!

GuillaumeGomez commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

rust-log-analyzer commented Jul 14, 2021

Uh oh!

GuillaumeGomez commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

rust-log-analyzer commented Jul 14, 2021

Uh oh!

GuillaumeGomez commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

rust-log-analyzer commented Jul 14, 2021

Uh oh!

bors commented Jul 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

GuillaumeGomez commented Jul 14, 2021•
edited
Loading