Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tbu- and others added 16 commits January 26, 2025 12:48
```
error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
  --> $DIR/issue-38147-1.rs:17:9
   |
LL |         self.s.push('x');
   |         ^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
   |
help: consider changing this to be a mutable reference
   |
LL |     fn f(&mut self) {
   |           +++
```

Note the suggestion to add `mut` instead of replacing the entire `&self` with `&mut self`.
Suggest considering casting fn item as fn pointer in more cases

Fixes rust-lang#132648
Test pipes also when not running on Windows and Linux simultaneously

Fixes rust-lang#135635 (review).

Based on top of rust-lang#135635 to avoid merge conflicts.
…nner, r=Kobzol

ci: remove unused windows runner
Properly check that array length is valid type during built-in unsizing in index

This results in duplicated errors, but this class of errors is not new; in general, we aren't really equipped to detect cases where a WF error due to a field type would be shadowed by the parent struct of that field also not being WF.

This also adds a note for these types of mismatches to make it clear that this is due to an array type.

Fixes rust-lang#134352

r? boxyuwu
Tweak `&mut self` suggestion span

```
error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference
  --> $DIR/issue-38147-1.rs:17:9
   |
LL |         self.s.push('x');
   |         ^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
   |
help: consider changing this to be a mutable reference
   |
LL |     fn f(&mut self) {
   |           +++
```

Note the suggestion to add `mut` instead of replacing the entire `&self` with `&mut self`.
… r=bjorn3

Make crate AST mutation accessible for driver callback

Following  rust-lang#134130, this brings back the ability to mutate AST before lowering.
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 Jan 29, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 29, 2025

📌 Commit c941b1c 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 Jan 29, 2025
@bors
Copy link
Collaborator

bors commented Jan 29, 2025

⌛ Testing commit c941b1c with merge 0cc4f4f...

@bors
Copy link
Collaborator

bors commented Jan 29, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0cc4f4f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 29, 2025
@bors bors merged commit 0cc4f4f into rust-lang:master Jan 29, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 29, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#133382 Suggest considering casting fn item as fn pointer in more c… 1a10a093af7f56ecf60a4aa517b1211db579b4fb (link)
#136092 Test pipes also when not running on Windows and Linux simul… 8722cdf53dcb6a8cdb046db86dcc4d987d86d72a (link)
#136190 Remove duplicated code in RISC-V asm bad-reg test 6674cc1ebef434da51a8d62e625a0c3ab47c90d7 (link)
#136192 ci: remove unused windows runner fa836c1c7aaf7971abf06d739ea4664403e4ae24 (link)
#136205 Properly check that array length is valid type during built… e03ed4a038c89ff462fb3ac564decb12f5d04de3 (link)
#136211 Update mdbook to 0.4.44 0010a0df5828bce28b016c7e737badd62d117df1 (link)
#136212 Tweak &mut self suggestion span 91fbe5f5b8da0328d2ada36bdf2debe1ece8b9d4 (link)
#136214 Make crate AST mutation accessible for driver callback 9a4fb611c41114f2f427f6082994d875699a08b5 (link)

previous master: a1d7676d6a

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 (0cc4f4f): 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 -3.8%, secondary 0.2%)

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)
3.9% [3.9%, 3.9%] 1
Improvements ✅
(primary)
-3.8% [-7.0%, -0.7%] 2
Improvements ✅
(secondary)
-1.7% [-2.1%, -1.3%] 2
All ❌✅ (primary) -3.8% [-7.0%, -0.7%] 2

Cycles

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

Binary size

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

Bootstrap: 777.437s -> 776.896s (-0.07%)
Artifact size: 328.50 MiB -> 328.47 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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.