Skip to content

Rollup of 9 pull requests #137248

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

Merged
merged 18 commits into from
Feb 19, 2025
Merged

Rollup of 9 pull requests #137248

merged 18 commits into from
Feb 19, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GrigorenkoPV and others added 18 commits February 15, 2025 00:17
The reexports confuse tooling like rustdoc into thinking cg_llvm is
the source of key types that originate in rustc_target.
I typoed the coercion direction here 4 years ago; fixing it now
This is a really weird module. For example, what does `tcx` in
`rustc_middle::mir::tcx::PlaceTy` mean? The answer is "not much".

The top-level module comment says:

> Methods for the various MIR types. These are intended for use after
> building is complete.

Awfully broad for a module that has a handful of impl blocks for some
MIR types, none of which really relates to `TyCtxt`. `git blame`
indicates the comment is ancient, from 2015, and made sense then.

This module is now vestigial. This commit removes it and moves all the
code within into `rustc_middle::mir::statement`. Some specifics:

- `Place`, `PlaceRef`, `Rvalue`, `Operand`, `BorrowKind`: they all have `impl`
  blocks in both the `tcx` and `statement` modules. The commit merges
  the former into the latter.

- `BinOp`, `UnOp`: they only have `impl` blocks in `tcx`. The commit
  moves these into `statement`.

- `PlaceTy`, `RvalueInitializationState`: they are defined in `tcx`.
  This commit moves them into `statement` *and* makes them available in
  `mir::*`, like many other MIR types.
…gjubilee

Use 'yes' instead of 'while-echo' in tests/ui/process/process-sigpipe.rs except 'nto'

The `sh` of AIX prints a message about a broken pipe when using the `while-echo` command. It works as expected when using the `yes` command instead. `yes` was originally used in this test but was later replaced with `while-echo` because QNX Neutrino does not have `yes` ([Replace yes command by while-echo in test tests/ui/process/process-sigpipe.rs](rust-lang#109379)). This PR updates the test to use `while-echo` for QNX Neutrino while reverting to `yes` for other platforms.
…jhpratt

Stabilize (and const-stabilize) `integer_sign_cast`

Tracking issue: rust-lang#125882
Closes: rust-lang#125882
FCP completed: rust-lang#125882 (comment)
fix: Alloc new errorcode E0803 for E0495

As discussion in rust-lang#136827, I alloc a new errorcode.
…notriddle

Update `minifier-rs` version to `0.3.5`

Encountered a bug around handling of `*` which blocked me for something I'm working on.

Also includes multiple fixes from ```@notriddle.```

r? ```@notriddle```
…rt, r=RalfJung

compiler: Stop reexporting stuff in cg_llvm::abi

The reexports confuse tooling like rustdoc into thinking cg_llvm is the source of key types that originate in rustc_target.
…x, r=compiler-errors

Remove `rustc_middle::mir::tcx` module.

This is a really weird module. For example, what does `tcx` in `rustc_middle::mir::tcx::PlaceTy` mean? The answer is "not much".

The top-level module comment says:

> Methods for the various MIR types. These are intended for use after
> building is complete.

Awfully broad for a module that has a handful of impl blocks for some MIR types, none of which really relates to `TyCtxt`. `git blame` indicates the comment is ancient, from 2015, and made sense then.

This module is now vestigial. This commit removes it and moves all the code within into `rustc_middle::mir::statement`. Some specifics:

- `Place`, `PlaceRef`, `Rvalue`, `Operand`, `BorrowKind`: they all have `impl` blocks in both the `tcx` and `statement` modules. The commit merges the former into the latter.

- `BinOp`, `UnOp`: they only have `impl` blocks in `tcx`. The commit moves these into `statement`.

- `PlaceTy`, `RvalueInitializationState`: they are defined in `tcx`. This commit moves them into `statement` *and* makes them available in `mir::*`, like many other MIR types.

r? `@tmandry`
… r=compiler-errors

eval_outlives: bail out early if both regions are in the same SCC

A drive-by optimisation of region outlives evaluation: if we are evaluating whether an outlives holds for two regions, bail out early if they are both in the same SCC.

This probably won't make a huge difference, but the cost is one comparison of SCC indices (integers).

May want a perf run, depending on how confident whomever reviewing this is!
…-not-subtypes, r=the8472

Fix typo in hidden internal docs of `TrustedRandomAccess`

I typoed the coercion direction here 4 years ago; fixing it now
…r=compiler-errors

Add reference annotations for the `do_not_recommend` attribute

This adds reference rule identifiers for the tests of the `diagnostic::do_not_recommend` attribute.
@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 19, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Feb 19, 2025

📌 Commit 24ba1ad 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 Feb 19, 2025
@bors
Copy link
Collaborator

bors commented Feb 19, 2025

⌛ Testing commit 24ba1ad with merge 5986ff0...

@bors
Copy link
Collaborator

bors commented Feb 19, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5986ff0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2025
@bors bors merged commit 5986ff0 into rust-lang:master Feb 19, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 19, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#136936 Use 'yes' instead of 'while-echo' in tests/ui/process/proce… edcde4c01552ddda0046e1eff74fbc1471a65e45 (link)
#137026 Stabilize (and const-stabilize) integer_sign_cast 38a881e9f90b77bc3c264062f556e4edaca31391 (link)
#137059 fix: Alloc new errorcode E0803 for E0495 e8a5c396878b3f832420436ff89f471b61543187 (link)
#137177 Update minifier-rs version to 0.3.5 53decb1ec918657f9b150c6ee20286471742e112 (link)
#137210 compiler: Stop reexporting stuff in cg_llvm::abi 28855460233b98719d3f681ebbb9100977e65fb0 (link)
#137213 Remove rustc_middle::mir::tcx module. ccb7afe42e45022bc9259acf862522bb8ba3fd94 (link)
#137216 eval_outlives: bail out early if both regions are in the sa… 298ae9ea8f6cc5545aec8be141e979e0363db292 (link)
#137228 Fix typo in hidden internal docs of TrustedRandomAccess 1fb170a1871e79bf83a572ff0cbb64c5b5b0b092 (link)
#137242 Add reference annotations for the do_not_recommend attrib… 4f7343f062043c5bd4b6974e1a7a77e66e58736f (link)

previous master: 17c1c329a5

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 (5986ff0): 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 (primary -2.3%)

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

Cycles

Results (primary -3.5%)

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

Binary size

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

Bootstrap: 773.157s -> 773.598s (0.06%)
Artifact size: 360.31 MiB -> 360.32 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. 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.