Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #110481

Merged
merged 23 commits into from
Apr 18, 2023
Merged

Rollup of 7 pull requests #110481

merged 23 commits into from
Apr 18, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

duckymirror and others added 23 commits April 16, 2023 12:09
This header can be used for tests which check the output of `--version --verbose` commands.
This avoids `rustc_data_structures` depending on `serde_json` which
allows it to be compiled much earlier, unlocking most of rustc.
Including steps executed during the dry run will result in a duplication
of all the steps in the build metrics, which just adds noise.
I think those don't make sense here, ig they were left from me copying the defs.
…larsan68

Set commit information environment variables when building tools

This fixes rust-lang#107094.
~I'm trying to add a regression test for this issue.~
**Update**: I've added a test and a new test header `needs-git-hash` which makes sure it doesn't run when commit hashes are ignored (`bootstrap`'s `ignore-git` option).
…ixes-rustdoc-book, r=Manishearth

Add list of supported disambiguators and suffixes for intra-doc links in the rustdoc book

This information is otherwise only provided in case an error occurs, which isn't great.

r? ```@notriddle```
…bject-notationing, r=fee1-dead

Don't use `serde_json` to serialize a simple JSON object

This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc.

This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge.
![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png)

This saves a few more seconds.

cc ````@Zoxc```` who added it recently
…, r=ozkanonur

Avoid including dry run steps in the build metrics

Including steps executed during the dry run will result in a duplication of all the steps in the build metrics, which just adds noise.
…-private-doc, r=notriddle,jyn514

rustdoc: Fix invalid handling of nested items with `--document-private-items`

Fixes rust-lang#110422.

The problem is that only impl block and re-exported `macro_rules!` items are "visible" as nested items. This PR adds the missing checks to handle this correctly.

cc `@compiler-errors`
r? `@notriddle`
Use `Item::expect_*` and `ImplItem::expect_*` more

r? ``@Nilstrieb``
…has_type_flags_is_fast, r=oli-obk

Assure everyone that `has_type_flags` is fast

`number_of_people_who_tripped_on_this += 1`

r? ``@oli-obk``
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 18, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit 5606653 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2023
@bors
Copy link
Contributor

bors commented Apr 18, 2023

⌛ Testing commit 5606653 with merge 74864fa...

@bors bors mentioned this pull request Apr 18, 2023
@bors
Copy link
Contributor

bors commented Apr 18, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 74864fa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2023
@bors bors merged commit 74864fa into rust-lang:master Apr 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 18, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110465 00251faae3c40a29828047351a365fa707071465
#110461 00ac6ff05262f7fefb8ed1a82d5ea9e759b74d99
#110450 9e89cd79792b5895cec4855a299033c7c46d0e4d
#110442 6a3ecb36af15e6c263e354cc237901f95e931933
#110409 36607c9b00c7103f774eb3b055769d481c7ec2a3
#110348 6047f89accf83526fb9d0a032775c2556d942542
#109981 a614c367f28014356026ef1624a88e34e46cc590

previous master: 386025117a

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (74864fa): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.5% [0.5%, 0.5%] 3
Improvements ✅
(primary)
-7.9% [-19.2%, -0.6%] 3
Improvements ✅
(secondary)
-1.6% [-1.8%, -1.3%] 2
All ❌✅ (primary) -7.9% [-19.2%, -0.6%] 3

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.7% [2.7%, 2.7%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.0% [-3.3%, -1.4%] 3
Improvements ✅
(secondary)
-2.1% [-2.8%, -1.4%] 3
All ❌✅ (primary) -0.8% [-3.3%, 2.7%] 4

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-10.0% [-15.8%, -4.2%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -10.0% [-15.8%, -4.2%] 2

@rustbot rustbot added the perf-regression Performance regression. label Apr 18, 2023
@lqd
Copy link
Member

lqd commented Apr 18, 2023

Interesting rustdoc win! The small wg-grammar regression looks like inlining perturbations in the incremental cache encoder, probably fine.

@lqd
Copy link
Member

lqd commented Apr 18, 2023

Yup wg-grammar is noisy as well.

image

@rylev
Copy link
Member

rylev commented Apr 19, 2023

Marking as triaged since the regression is noise

@rustbot label +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 19, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-phkkgm9 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.