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 4 pull requests #133160

Merged
merged 16 commits into from
Nov 18, 2024
Merged

Rollup of 4 pull requests #133160

merged 16 commits into from
Nov 18, 2024

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Nov 18, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tareknaser and others added 16 commits November 13, 2024 15:02
…rder_fields

Migrate `reorder_fields` Assist to Use `SyntaxFactory`
They were converted to LSP position using the current file's line index, which is obviously wrong.
Overhaul the `-l` option parser (for linking to native libs)

The current parser for `-l` options has accumulated over time, making it hard to follow. This PR tries to clean it up in several ways.

Key changes:
- This code now gets its own submodule, to slightly reduce clutter in `rustc_session::config`.
- Cleaner division between iterating over multiple `-l` options, and processing each individual one.
- Separate “split” step that breaks up the value string into `[KIND[:MODIFIERS]=]NAME[:NEW_NAME]`, but leaves parsing/validating those parts to later steps.
  - This step also gets its own (disposable) unit test, to make sure it works as expected.
- A context struct reduces the burden of parameter passing, and makes it easier to write error messages that adapt to nightly/stable compilers.
- Fewer calls to `nightly_options` helper functions, because at this point we can get the same information from `UnstableOptions` and `UnstableFeatures` (which are downstream of earlier calls to those helper functions).

There should be no overall change in compiler behaviour.
…r-errors

rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect

In rust-lang#120370 this name caused confusion as the author thought the intrinsic was stable. So let's try a different name...

If we can land this before the beta cutoff we can avoid needing `cfg(bootstrap)` for this. ;)
Cc `@compiler-errors` `@saethlin`
Document alternatives to `static mut`

In rust-lang#133143 I've noticed alternatives to `static mut` aren't documented anywhere.
Subtree update of `rust-analyzer`

r? `@ghost`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. rollup A PR which is a rollup labels Nov 18, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Nov 18, 2024

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Nov 18, 2024

📌 Commit 194c76e has been approved by jhpratt

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 18, 2024
@bors
Copy link
Contributor

bors commented Nov 18, 2024

⌛ Testing commit 194c76e with merge 9b9c99a...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2024
Rollup of 4 pull requests

Successful merges:

 - rust-lang#132934 (Overhaul the `-l` option parser (for linking to native libs))
 - rust-lang#133142 (rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect)
 - rust-lang#133145 (Document alternatives to `static mut`)
 - rust-lang#133158 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] miri test:false 5.849
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Mon, Nov 18, 2024 12:05:31 PM
  network time: Mon, 18 Nov 2024 12:05:31 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Nov 18, 2024

💔 Test failed - checks-actions

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

@bors retry (msvc)

@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 18, 2024
@jieyouxu jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. CI-spurious-fail-msvc CI spurious failure: target env msvc 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2024
@bors
Copy link
Contributor

bors commented Nov 18, 2024

⌛ Testing commit 194c76e with merge c602e9a...

@bors
Copy link
Contributor

bors commented Nov 18, 2024

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing c602e9a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2024
@bors bors merged commit c602e9a into rust-lang:master Nov 18, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 18, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#132934 Overhaul the -l option parser (for linking to native libs) 2a4dfcdfa076e49ce6f4b2413dae866aeedecead (link)
#133142 rename rustc_const_stable_intrinsic -> rustc_intrinsic_cons… 416ffba5b9c5876497ed55323cb96689284982e1 (link)
#133145 Document alternatives to static mut 2f8998f346b8dd49e0b651ac69fa594b6e87de29 (link)
#133158 Subtree update of rust-analyzer 0b2e37d1350739b22a50d0b6840f7d2cd92a29d4 (link)

previous master: e83c45a98b

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 (c602e9a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary 2.6%)

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

Cycles

Results (secondary -2.0%)

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

Binary size

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

Bootstrap: 790.339s -> 790.89s (0.07%)
Artifact size: 335.02 MiB -> 335.05 MiB (0.01%)

@jhpratt jhpratt deleted the rollup-wzj9q15 branch November 26, 2024 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-spurious-fail-msvc CI spurious failure: target env msvc 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.