Rollup of 7 pull requests #116772

matthiaskrgr · 2023-10-15T19:29:10Z

Successful merges:

Broaden the consequences of recursive TLS initialization #116172 (Broaden the consequences of recursive TLS initialization)
Implement sys::args for UEFI #116341 (Implement sys::args for UEFI)
use PatKind::Error when an ADT const value has violation #116522 (use PatKind::Error when an ADT const value has violation)
Make x capable of resolving symlinks #116732 (Make x capable of resolving symlinks)
Remove me from libcore review rotation #116755 (Remove me from libcore review rotation)
Remove trivial cast in guaranteed_eq #116760 (Remove trivial cast in guaranteed_eq)
Ignore let-chains formatting #116771 (Ignore let-chains formatting)

r? @ghost
@rustbot modify labels: rollup

When bootstrapping from outside of the rust source, instead of calling 'x' from the absolute path (like /home/user/rust/x), we should be able to link 'x' from the rust source to binary paths so it can be used easily. Before this change, 'x' was not capable of finding 'x.py' when called from the linked file. Signed-off-by: onur-ozkan <work@onurozkan.dev>

I found this while accidentally breaking trivial casts in another branch.

- Uses `EFI_LOADED_IMAGE_PROTOCOL` - verify that cli args are valid UTF-16 - Update Docs Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

…n, r=dtolnay Broaden the consequences of recursive TLS initialization This PR updates the documentation of `LocalKey` to clearly disallow the behaviour described in [this comment](rust-lang#110897 (comment)). This allows using `OnceCell` for the lazy initialization of TLS variables, which panics on reentrant initialization instead of updating the value like TLS variables currently do. ``@rustbot`` label +T-libs-api r? ``@m-ou-se``

…crum Implement sys::args for UEFI - Uses `EFI_LOADED_IMAGE_PROTOCOL`, which is implemented for all loaded images. Tested on qemu with OVMF cc ``@nicholasbishop`` cc ``@dvdhrm``

use `PatKind::Error` when an ADT const value has violation Fixes rust-lang#115599 Since the [to_pat](https://github.com/rust-lang/rust/pull/111913/files#diff-6d8d99538aca600d633270051580c7a9e40b35824ea2863d9dda2c85a733b5d9R126-R155) behavior has been changed in the rust-lang#111913 update, the kind of `inlined_const_ast_pat` has transformed from `PatKind::Leaf { pattern: Pat { kind: Wild, ..} } ` to `PatKind::Constant`. This caused a scenario where there are no matched candidates, leading to a testing of the candidates. This process ultimately attempts to test the string const, triggering the `bug!` invocation finally. r? ``@oli-obk``

…k-Simulacrum Make x capable of resolving symlinks When bootstrapping from outside of the rust source, instead of calling 'x' from the absolute path (like /home/user/rust/x), we should be able to link 'x' from the rust source to binary paths so it can be used easily. Before this change, 'x' was not capable of finding 'x.py' when called from the linked file.

…imulacrum Remove me from libcore review rotation I'm looking at my commitments right now, and unfortunately this needs to go for at least a while. If there's something in particular I can probably still take them, but I should drop out of the rotation for now.

Remove trivial cast in `guaranteed_eq` I found this while accidentally breaking trivial casts in another branch. r? oli-obk

…hains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

matthiaskrgr · 2023-10-15T19:29:23Z

@bors r+ rollup=never p=7

bors · 2023-10-15T19:29:25Z

📌 Commit 66417cb has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-15T21:10:53Z

⌛ Testing commit 66417cb with merge 42b1224...

bors · 2023-10-15T23:03:55Z

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

rust-timer · 2023-10-15T23:05:55Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116172	Broaden the consequences of recursive TLS initialization	`95a092e84485240e50f6264125525fc0518112ac` (link)
#116341	Implement sys::args for UEFI	`70f405a10b276f9f4d599a4dc9af5381f48ee015` (link)
#116522	use `PatKind::Error` when an ADT const value has violation	`8ef03b70acb1b46702a46f3c4a68dc6f69c38b4f` (link)
#116732	Make x capable of resolving symlinks	`a0342cd4151f69602b70f35f2160c66fbca43702` (link)
#116755	Remove me from libcore review rotation	`52e519e3065d49bcf526fa42f7867d2d661356bb` (link)
#116760	Remove trivial cast in `guaranteed_eq`	`03e09d87afc63d03a7c1dc5f4c879d4490729d12` (link)
#116771	Ignore let-chains formatting	`7f9cb08239c23954451a009968f88bde93cb006f` (link)

previous master: f70779b0fb

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-10-16T05:16:09Z

Finished benchmarking commit (42b1224): 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

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

Cycles

Results

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.2%	[-2.2%, -2.2%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 625.093s -> 623.806s (-0.21%)
Artifact size: 305.52 MiB -> 305.51 MiB (-0.00%)

joboet and others added 14 commits September 26, 2023 12:54

std: broaden the allowed behaviour for recursive TLS initialization

559ec69

Remove me from libcore review rotation

b50aa24

Remove trivial cast in guaranteed_eq

fe9d422

I found this while accidentally breaking trivial casts in another branch.

use PatKind::error when an ADT const value has violation

223674a

Implement args for UEFI

6713ae9

- Uses `EFI_LOADED_IMAGE_PROTOCOL` - verify that cli args are valid UTF-16 - Update Docs Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

Ignore let-chains formatting

07e8ee5

Rollup merge of rust-lang#116341 - Ayush1325:uefi-args, r=Mark-Simula…

835edc1

…crum Implement sys::args for UEFI - Uses `EFI_LOADED_IMAGE_PROTOCOL`, which is implemented for all loaded images. Tested on qemu with OVMF cc ``@nicholasbishop`` cc ``@dvdhrm``

Rollup merge of rust-lang#116760 - Nilstrieb:triviality, r=oli-obk

32da83d

Remove trivial cast in `guaranteed_eq` I found this while accidentally breaking trivial casts in another branch. r? oli-obk

Rollup merge of rust-lang#116771 - compiler-errors:blame-ignore-let-c…

66417cb

…hains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

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 Oct 15, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2023

bors merged commit 42b1224 into rust-lang:master Oct 15, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 15, 2023

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #116772

Rollup of 7 pull requests #116772

matthiaskrgr commented Oct 15, 2023

matthiaskrgr commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

rust-timer commented Oct 15, 2023

rust-timer commented Oct 16, 2023

Rollup of 7 pull requests #116772

Rollup of 7 pull requests #116772

Conversation

matthiaskrgr commented Oct 15, 2023

matthiaskrgr commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

rust-timer commented Oct 15, 2023

rust-timer commented Oct 16, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size