Rollup of 8 pull requests by matthiaskrgr · Pull Request #112336 · rust-lang/rust

matthiaskrgr · 2023-06-06T04:56:42Z

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)
Improved std support for ps vita target #111819 (Improved std support for ps vita 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)

Failed merges:

rustdoc: convert if let Some() that always matches to variable #112251 (rustdoc: convert if let Some() that always matches to variable)

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 Fixesrust-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`.

Improved std support for ps vita target Fixed a couple of things in std support for ps vita via Vita SDK newlib oss implementation: - Added missing hardware features to target spec - Compile in thumb by default (newlib is also compiled in thumb) - Fixed fs calls. Vita newlib has a not-very-posix dirent. Also vita does not expose inodes, it's stubbed as 0 in stat, and I'm stubbing it here for dirent (because vita newlibs's dirent doesn't even have that field) - Enabled signal handlers for panic unwinding - Dropped static link requirement from the platform support md. Also, rearranged sections to better stick with the template.

…ulacrum Make GDB Python Pretty Printers loadable after spawning GDB, avoiding required `rust-gdb` Fixesrust-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`. Fixesrust-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 `..` ``` Fixesrust-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 Fixesrust-lang#111932

matthiaskrgr · 2023-06-06T04:56:58Z

@bors r+ rollup=never p=8

bors · 2023-06-06T04:57:00Z

📌 Commit eaa940a has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-06-06T09:33:44Z

⌛ Testing commit eaa940a with merge afaed29e49914010d5812ce0314dfef7077ea4ef...

bors · 2023-06-06T09:40:22Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-06-06T09:42:16Z

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

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

[RUSTC-TIMING] libc test:false 3.062
Compiling unicode-normalization v0.1.22
[RUSTC-TIMING] io_lifetimes test:false 0.122
error[E0061]: this function takes 3 arguments but 2 arguments were supplied
--> /cargo/registry/src/index.crates.io-6f17d22bba15001f/getrandom-0.2.8/src/util_libc.rs:150:18
|
150 | let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
| ^^^^------------------------------------------------------------- an argument of type `u32` is missing
note: function defined here
--> /cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.145/src/unix/linux_like/linux/musl/lfs64.rs:112:26
|
112 | pub unsafe extern "C" fn open64(
112 | pub unsafe extern "C" fn open64(
| ^^^^^^
help: provide the argument
|
150 | let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC, /* u32 */);
For more information about this error, try `rustc --explain E0061`.
[RUSTC-TIMING] getrandom test:false 0.346
error: could not compile `getrandom` (lib) due to previous error

Noratrieb · 2023-06-06T09:47:10Z

probably #111819

matthiaskrgr · 2023-06-06T04:56:42Z

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)
Improved std support for ps vita target #111819 (Improved std support for ps vita 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)

Failed merges:

rustdoc: convert if let Some() that always matches to variable #112251 (rustdoc: convert if let Some() that always matches to variable)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup