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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #118001

Merged
merged 18 commits into from
Nov 17, 2023
Merged

Rollup of 5 pull requests #118001

merged 18 commits into from
Nov 17, 2023

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Nov 17, 2023

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 18 commits November 12, 2023 22:34
@onur-ozkan
bootstrap: simplify setting unstable-options for tools
b1afb6c 
We unconditionally set this to avoid recompiling tools between
`x check $tool` and `x test $tool` executions.

See rust-lang#116538 for more information.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@epage
docs(release): Remove cargo-as-a-lib change
cc7d451
@epage
docs(release): Add missing cargo-clean change
2aad060
@epage
docs(release): Clarify cargo line items
40e8a43
@epage
docs(release): Very rough 'importance' sort
64c0ec6
@epage
docs(release): Remove unstable cargo change
c8330ba
@nnethercote
Remove unused features.
0007675
@RalfJung
avoid exhaustive i16 test in Miri
1c1b789
@nnethercote
Reduce exposure of things.
8f669f5
@nnethercote
Inline and remove create_lint_store.
5dfe47a
@nnethercote
Remove dead lint code.
73c1fc5
@nnethercote
Move lint_store from GlobalCtxt to Session.
a3b4961 
This was made possible by the removal of plugin support, which
simplified lint store creation.

This simplifies the places in rustc and rustdoc that call
`describe_lints`, which are early on. The lint store is now built before
those places, so they don't have to create their own lint store for
temporary use, they can just use the main one.
@nnethercote
Remove Compiler::register_lints.
dededd2 
Lint registration now happens early enough that we can run it from
`Config`, before `Compiler` is created.
@TaKO8Ki
Rollup merge of rust-lang#117649 - nnethercote:mv-lint_store, r=cjgillot
2b2dd25 
Move `lint_store`

Some nice cleanups enabled by the removal of compiler plugins.

r? `@cjgillot`
@TaKO8Ki
Rollup merge of rust-lang#117850 - onur-ozkan:fix-116538, r=Mark-Simu…
3644594 
…lacrum

bootstrap: simplify setting unstable-options for tools

Previously, we unconditionally(instead of `if path == "src/tools/clippy" || ..`) set this (to prevent recompiling tools between `x check $tool` and '` check $another_tool` executions) specifically for tools in the `x check` step. This PR relocates that logic to `fn prepare_tool_cargo`, making it step-agnostic.

Fixes rust-lang#116538
Fixes rust-lang#117983
@TaKO8Ki
Rollup merge of rust-lang#117889 - epage:docs, r=Mark-Simulacrum
3c0f22d 
docs(release): Clarify cargo entries

Trying to make these easier to scan and more understandable out of the context of their PR
@TaKO8Ki
Rollup merge of rust-lang#117946 - RalfJung:miri-libcore-test, r=Mark…
c77cb7a 
…-Simulacrum

avoid exhaustive i16 test in Miri

rust-lang#116301 added a test that is way too slow to be running in Miri. So let's only test a few hopefully representative cases.
@TaKO8Ki
Rollup merge of rust-lang#117963 - nnethercote:rustc_query_system, r=…
68f5762 
…compiler-errors

`rustc_query_system` cleanups

Minor cleanups.

r? `@compiler-errors`
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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 Nov 17, 2023
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Nov 17, 2023

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 17, 2023

📌 Commit 68f5762 has been approved by TaKO8Ki

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 Nov 17, 2023
@bors
Copy link
Contributor

bors commented Nov 17, 2023

⌛ Testing commit 68f5762 with merge 4770d91...

@bors
Copy link
Contributor

bors commented Nov 17, 2023

☀️ Test successful - checks-actions
Approved by: TaKO8Ki
Pushing 4770d91 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2023
@bors bors merged commit 4770d91 into rust-lang:master Nov 17, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 17, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#117649 Move lint_store 8fe78e455d73a02af07d7032faf3d8c10e9dd5c3 (link)
#117850 bootstrap: simplify setting unstable-options for tools 306d4642d83c10c2611d3a008ed45374152a7ccc (link)
#117889 docs(release): Clarify cargo entries 3f69a17bf5fcad3cd0c82f6656a837e0f66a8f5c (link)
#117946 avoid exhaustive i16 test in Miri f22d12f24e8715483f24e05cc94faae8280ccea9 (link)
#117963 rustc_query_system cleanups 8fded555c0d29c5d7344e5156f9bcc2028c6f8c9 (link)

previous master: 15a791fa35

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

@bors bors mentioned this pull request Nov 17, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4770d91): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

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.4% [0.2%, 0.7%] 2
Regressions ❌
(secondary)		 1.7% [1.7%, 1.7%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) 0.4% [0.2%, 0.7%] 2

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)		 1.6% [0.5%, 3.1%] 4
Regressions ❌
(secondary)		 1.8% [0.6%, 2.9%] 3
Improvements ✅
(primary)		 -1.3% [-1.6%, -1.0%] 2
Improvements ✅
(secondary)		 -2.8% [-6.8%, -0.4%] 6
All ❌✅ (primary) 0.6% [-1.6%, 3.1%] 6

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)		 -0.7% [-0.8%, -0.7%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.7% [-0.8%, -0.7%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 674.777s -> 676.51s (0.26%)
Artifact size: 313.65 MiB -> 313.61 MiB (-0.01%)

@lqd
Copy link
Member

lqd commented Nov 17, 2023

Note for next week's triage if this PR comes up in the results: the deep-vector regression looks like noise to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
9 participants
@TaKO8Ki @bors @rust-timer @lqd @rustbot @onur-ozkan @epage @nnethercote @RalfJung