Skip to content

Rollup of 8 pull requests - #86502

Merged
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-wge0f3x
Jun 21, 2021
Merged

Rollup of 8 pull requests#86502
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-wge0f3x

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJungand others added 23 commits May 24, 2021 18:18
Co-authored-by: Jane Lusby <jlusby42@gmail.com>
The `RustdocGUI::should_run` condition spawns `npm list` several times
which adds up to seconds of wall-time.
Evaluate the condition lazily to to keep `./x.py test tidy` and similar
short-running tasks fast.
This was unsound since a panic in a.next_back() would result in the
length not being updated which would then lead to the same element
being revisited in the side-effect preserving code.
Account for bad placeholder errors on consts/statics with trait objects
Fixesrust-lang#75889
r? ``@estebank``
document PartialEq, PartialOrd, Ord requirements more explicitly
This is the result of discussion in rust-lang#50230, in particular [this summary comment](rust-lang#50230 (comment)).
Fixesrust-lang#50230.
…Simulacrum
Lazify is_really_default condition in the RustdocGUI bootstrap step
The `RustdocGUI::should_run` condition spawns `npm list` several times which adds up to seconds of wall-time.
Evaluate the condition lazily to to keep `./x.py test tidy` and similar short-running tasks fast.
Fixesrust-lang#86147
…ulacrum
Fix a bug in the linkchecker
There was a small typo in the linkchecker (in rust-lang#85652) that caused it to report a `#` fragment link error pointing to the wrong file (it was displaying the path to the source file, not the target of the link).
This also includes a few other changes:
- Fixes the tests due to some changes in the redirect handling in rust-lang#84703.
- Adds the tests to rustbuild to run whenever the linkchecker itself is run.
- Updates the tests to validate more of the output (so that a mistake like this would have been caught).
Closesrust-lang#86144
fix panic-safety in specialized Zip::next_back
This was unsound since a panic in a.next_back() would result in the
length not being updated which would then lead to the same element
being revisited in the side-effect preserving code.
fixesrust-lang#86443
…r=petrochenkov
Do not set depth to 0 in fully_expand_fragment
Fixesrust-lang#84632.
expand: Move some more derive logic to rustc_builtin_macros
And cleanup some `unwrap`s in `cfg_eval`.
Refactorings extracted from rust-lang#83354 and rust-lang#86057.
r? ``@Aaron1011``
@rustbotrustbot added the rollup A PR which is a rollup label Jun 21, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Jun 21, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 8b9e138 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 21, 2021
@bors

bors commented Jun 21, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8b9e138 with merge 6a540bd...

@bors

bors commented Jun 21, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 6a540bd to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2021
@bors
bors merged commit 6a540bd into rust-lang:masterJun 21, 2021
@rustbotrustbot added this to the 1.55.0 milestone Jun 21, 2021
@JohnTitor
JohnTitor deleted the rollup-wge0f3x branch June 21, 2021 04:23
github-actionsBot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
Rollup of 8 pull requests
Successful merges:
- rust-lang#83739 (Account for bad placeholder errors on consts/statics with trait objects)
- rust-lang#85637 (document PartialEq, PartialOrd, Ord requirements more explicitly)
- rust-lang#86152 (Lazify is_really_default condition in the RustdocGUI bootstrap step)
- rust-lang#86156 (Fix a bug in the linkchecker)
- rust-lang#86427 (Updated release note)
- rust-lang#86452 (fix panic-safety in specialized Zip::next_back)
- rust-lang#86484 (Do not set depth to 0 in fully_expand_fragment)
- rust-lang#86491 (expand: Move some more derive logic to rustc_builtin_macros)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@JohnTitor@bors@rustbot@RalfJung@ehuss@the8472@0xPoe@petrochenkov@fee1-dead