Rollup of 7 pull requests #112344

matthiaskrgr · 2023-06-06T10:00:35Z

Successful merges:

Correct fortanix LVI test print function #111058 (Correct fortanix LVI test print function)
Added custom risc32-imac for esp-espidf target #111369 (Added custom risc32-imac for esp-espidf target)
Make GDB Python Pretty Printers loadable after spawning GDB, avoiding required rust-gdb #111962 (Make GDB Python Pretty Printers loadable after spawning GDB, avoiding required rust-gdb)
Don't suggest changing &self and &mut self in function signature to be mutable when taking &mut self in closure #112019 (Don't suggest changing &self and &mut self in function signature to be mutable when taking &mut self in closure)
Fix suggestion for matching struct with .. on both ends #112199 (Fix suggestion for matching struct with .. on both ends)
Cleanup some EarlyBinder::skip_binder() -> EarlyBinder::subst_identity() #112220 (Cleanup some EarlyBinder::skip_binder() -> EarlyBinder::subst_identity())
diagnostics: do not suggest type name tweaks on type-inferred closure args #112325 (diagnostics: do not suggest type name tweaks on type-inferred closure args)

r? @ghost
@rustbot modify labels: rollup

Makes the Python pretty printer library source'able from within GDB after spawn. This makes `rust-gdb` not the required approach. It also provides the possibility for GUI:s that wrap GDB, to debug Rust using the pretty printer library; as well as other projects such as for instance Pernosco, which previously was not possible. This won't introduce any new unexpected behaviors for users of `rust-gdb`

… args Fixes rust-lang#111932

…, r=cuviper Correct fortanix LVI test print function A recent change resulted in a different machine code for the `print` function. This caused the LVI test for this function to fail. This PR: - Fixes the test for the `print` function - Simplified the test a bit so future modifications are more unlikely cc: ``@jethrogb``

Added custom risc32-imac for esp-espidf target ESP32-C6 and the upcoming ESP32-P4 are the first Espressif chips that support the "A" (atomic) extension of the RISCV specification. As such, they do not work with the existing `riscv32imc-esp-espidf` target and instead need a new one (in this PR) called `riscv32imac-esp-espidf`.

…ulacrum Make GDB Python Pretty Printers loadable after spawning GDB, avoiding required `rust-gdb` Fixes rust-lang#111961 Makes the Python pretty printer library source'able from within GDB after spawn, making the wrapper script `rust-gdb` become not the required approach to use the pretty printer library. Allows for integration into GUI:s that wrap GDB extremely easy. The previous design complicates this feature.

…errors Don't suggest changing `&self` and `&mut self` in function signature to be mutable when taking `&mut self` in closure Current suggestion for when taking a mutable reference to `self` in a closure (as an upvar) will produce a machine-applicable suggestion to change the `self` in the function signature to `mut self`, but does not account for the specialness of implicit self in that it can already have `&` and `&mut` (see rust-lang#111554). This causes the function signature to become `test(&mut mut self)` which does not seem desirable. ``` error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable --> src/sound_player.rs:870:11 | 869 | pub fn test(&mut self) { | ---- help: consider changing this to be mutable: `mut self` 870 | || test2(&mut self); | ^^^^^^^^^ cannot borrow as mutable ``` This PR suppresses the "changing this to be mutable" suggestion if the implicit self is either `ImplicitSelfKind::ImmRef` or `ImplicitSelfKind::MutRef`. Fixes rust-lang#111554.

…errors Fix suggestion for matching struct with `..` on both ends ### Before This PR ``` error: expected `}`, found `,` --> src\main.rs:8:17 | 8 | Foo { .., x, .. } => (), | --^ | | | | | expected `}` | `..` must be at the end and cannot have a trailing comma | help: move the `..` to the end of the field list | 8 - Foo { .., x, .. } => (), 8 + Foo { .., x, , .. } => (), | ``` ### After This PR ``` error: expected `}`, found `,` --> tests/ui/parser/issue-112188.rs:11:17 | 11 | let Foo { .., x, .. } = f; //~ ERROR expected `}`, found `,` | --^- | | | | | expected `}` | `..` must be at the end and cannot have a trailing comma | help: remove the starting `..` ``` Fixes rust-lang#112188.

…piler-errors Cleanup some `EarlyBinder::skip_binder()` -> `EarlyBinder::subst_identity()` fix some incorrect `skip_binder()`'s as identified in rust-lang#112006 (review) r? ``@compiler-errors`` ``@lcnr`` ``@jackh726`` (hope it's alright to just tag everyone who commented 😅)

…r=compiler-errors diagnostics: do not suggest type name tweaks on type-inferred closure args Fixes rust-lang#111932

matthiaskrgr · 2023-06-06T10:00:52Z

@bors r+ rollup=neverp=7

bors · 2023-06-06T10:00:54Z

📌 Commit 38c92cc has been approved by matthiaskrgr

It is now in the queue for this repository.

matthiaskrgr · 2023-06-06T10:01:09Z

@bors r+ rollup=never p=7

bors · 2023-06-06T10:01:10Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Update to LLVM 16.0.5 #112312

bors · 2023-06-06T10:01:11Z

📌 Commit 38c92cc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-06-06T13:18:41Z

⌛ Testing commit 38c92cc with merge 8864a1b99731172acb2ffbdc343b848630c2f231...

bors · 2023-06-06T17:33:41Z

💥 Test timed out

matthiaskrgr · 2023-06-06T17:56:15Z

@bors retry

bors · 2023-06-06T17:56:25Z

⌛ Testing commit 38c92cc with merge b2b34bd...

rust-log-analyzer · 2023-06-06T18:06:56Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2023-06-06T21:28:27Z

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

rust-timer · 2023-06-06T21:30:26Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#112325	76678e1c3b8be78fa4dfa809b9b710d734686ccd
#112220	ece8da02f8be898168ea17e027751b5fb473ac04
#112199	b4688543e6f1e71467979b7e5fb4fb2a2c9b8e94
#112019	3fadfda10dc9f9ab85847db33e384dada6bc77bb
#111962	371d3dac13a9148c8641ee28f71ad476efb9b2ef
#111369	3317021f24c5c932464966f9eb2b3da1002af0d8
#111058	387602c21c21ffb4a5ee39979af6ea72400bac5e

previous master: 3572d7451d

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 · 2023-06-06T23:59:19Z

Finished benchmarking commit (b2b34bd): 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)	5.4%	[5.4%, 5.4%]	1
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.2%, -0.2%]	2

Max RSS (memory usage)

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

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: 646.759s -> 645.848s (-0.14%)

pnkfelix · 2023-06-13T20:58:17Z

sole regression is to secondary coercions debug incr-full.
not worth dissecting this rollup for that.
marking as triaged.

@rustbot label: +perf-regression-triaged

jieyouxu and others added 15 commits May 29, 2023 13:11

Don't suggest changing {ImmRef,MutRef} implicit self to be mutable

57e67e4

Fix suggestion for matching struct with .. on both ends

2a7c6a9

Added custom risc32-imac for esp-espidf target

1f5361b

Correct LVI print function test

62c8c7c

Verify that (almost) all ret instructions have been replaced

b35f243

cleanup some skip_binder -> subst_identity

57cbe25

diagnostics: do not suggest type name tweaks on type-inferred closure…

467bc9f

… args Fixes rust-lang#111932

Rollup merge of rust-lang#112325 - notriddle:notriddle/issue-111932, …

38c92cc

…r=compiler-errors diagnostics: do not suggest type name tweaks on type-inferred closure args Fixes rust-lang#111932

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 Jun 6, 2023

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 6, 2023

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 6, 2023

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 Jun 6, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 6, 2023

bors merged commit b2b34bd into rust-lang:master Jun 6, 2023

rustbot added this to the 1.72.0 milestone Jun 6, 2023

rustbot added the perf-regression Performance regression. label Jun 6, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 13, 2023

matthiaskrgr deleted the rollup-tswr83e branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #112344

Rollup of 7 pull requests #112344

matthiaskrgr commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

rust-log-analyzer commented Jun 6, 2023

bors commented Jun 6, 2023

rust-timer commented Jun 6, 2023

rust-timer commented Jun 6, 2023

pnkfelix commented Jun 13, 2023

Rollup of 7 pull requests #112344

Rollup of 7 pull requests #112344

Conversation

matthiaskrgr commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

bors commented Jun 6, 2023

matthiaskrgr commented Jun 6, 2023

bors commented Jun 6, 2023

rust-log-analyzer commented Jun 6, 2023

bors commented Jun 6, 2023

rust-timer commented Jun 6, 2023

rust-timer commented Jun 6, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

pnkfelix commented Jun 13, 2023