Rollup of 7 pull requests #123869

matthiaskrgr · 2024-04-12T19:47:01Z

Successful merges:

typeck: fix ? suggestion span #123654 (typeck: fix ? suggestion span)
Remove sys_common::thread #123807 (Remove sys_common::thread)
Don't do coroutine-closure-specific upvar analysis if tainted by errors #123834 (Don't do coroutine-closure-specific upvar analysis if tainted by errors)
Suppress let else suggestion for uninitialized refutable lets #123847 (Suppress let else suggestion for uninitialized refutable lets)
std::net: TcpListener shrinks the backlog argument to 32 for Haiku. #123857 (std::net: TcpListener shrinks the backlog argument to 32 for Haiku.)
zkvm: fix path to cmath in zkvm module #123858 (zkvm: fix path to cmath in zkvm module)
Add unsafe to two functions with safety invariants #123867 (Add unsafe to two functions with safety invariants)

r? @ghost
@rustbot modify labels: rollup

This can cause rustfix to crash because the `?` suggestion previously could point into non-local spans, such as into the stdlib.

This test contains conflicting MaybeIncorrect suggestions which will cause the fixed file to not compile.

- Remove cmath from zkvm module since cmath was moved to sys and is shared by all platforms (see rust-lang#120109)

The suggestion to use `let else` with an uninitialized refutable `let` statement was erroneous: `let else` cannot be used with deferred initialization.

…rieril typeck: fix `?` suggestion span Noticed in <rust-lang#112043 (comment)>, if the ``` use the `?` operator to extract the `Result<(), std::fmt::Error>` value, propagating a `Result::Err` value to the caller ``` suggestion is applied to a macro that comes from a non-local crate (e.g. the stdlib), the suggestion span can become non-local, which will cause newer rustfix versions to fail. This PR tries to remedy the problem by recursively probing ancestors of the expression span, trying to identify the most ancestor span that is (1) still local, and (2) still shares the same syntax context as the expression. This is the same strategy used in rust-lang#112043. The test unfortunately cannot `//@ run-rustfix` because there are two conflicting MaybeIncorrect suggestions that when collectively applied, cause the fixed source file to become non-compilable. Also avoid running `//@ run-rustfix` for `tests/ui/typeck/issue-112007-leaked-writeln-macro-internals.rs` because that also contains conflicting suggestions. cc `@ehuss` who noticed this. This question mark span fix + not running rustfix on the tests containing conflicting MaybeIncorrect suggestions should hopefully unblock rustfix from updating.

Remove `sys_common::thread` Part of rust-lang#117276. The stack size calculation isn't system-specific at all and can just live together with the rest of the spawn logic.

…-tainted-body, r=oli-obk Don't do coroutine-closure-specific upvar analysis if tainted by errors See the comment Fixes rust-lang#123821 Fixes rust-lang#123818

Suppress `let else` suggestion for uninitialized refutable `let`s Fixes rust-lang#123844 r? `@CAD97`

…og, r=ChrisDenton std::net: TcpListener shrinks the backlog argument to 32 for Haiku.

…boet zkvm: fix path to cmath in zkvm module I don't know why the original author decided to use relative paths. I think it would be better to use `use crate::sys::cmath;` The according issue can be found here risc0/risc0#1647

Add `unsafe` to two functions with safety invariants

matthiaskrgr · 2024-04-12T19:47:15Z

@bors r+ rollup=never p=7

bors · 2024-04-12T19:47:17Z

📌 Commit 3026204 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-04-12T20:23:33Z

⌛ Testing commit 3026204 with merge 7942405...

bors · 2024-04-12T22:26:25Z

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

rust-timer · 2024-04-12T22:28:22Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#123654	typeck: fix `?` suggestion span	`77a1eece246b595e0935de824adb1e404d17d502` (link)
#123807	Remove `sys_common::thread`	`245c95db447ed7cd2c7ee643b9e6874ffbffba94` (link)
#123834	Don't do coroutine-closure-specific upvar analysis if taint…	`f640ce00230ba8337f05a3e4f43a0b9017eddb26` (link)
#123847	Suppress `let else` suggestion for uninitialized refutable …	`0f22d9dd380a018d34d1fba6e92fb17746cea20f` (link)
#123857	std::net: TcpListener shrinks the backlog argument to 32 fo…	`3d766d16005df574f1728b864d6c9b725fc2cbc3` (link)
#123858	zkvm: fix path to cmath in zkvm module	`3243fc57e5df3171ed8d7913be9219f8f1f37169` (link)
#123867	Add `unsafe` to two functions with safety invariants	`e3c8a5cd64f079ef3e16ae65b3415324ddad5447` (link)

previous master: 22a2425c10

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 · 2024-04-13T03:06:18Z

Finished benchmarking commit (7942405): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

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.4%	[0.4%, 0.5%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.4%, 0.5%]	2

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)	5.1%	[3.1%, 7.1%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-6.2%	[-6.2%, -6.2%]	1
Improvements ✅ (secondary)	-3.8%	[-3.8%, -3.8%]	1
All ❌✅ (primary)	1.3%	[-6.2%, 7.1%]	3

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

Binary size

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.0%	[0.0%, 0.3%]	11
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[-0.1%, 0.3%]	12

Bootstrap: 676.361s -> 676.092s (-0.04%)
Artifact size: 316.01 MiB -> 316.03 MiB (0.01%)

jieyouxu and others added 16 commits April 10, 2024 19:37

test: check that ? suggestion has local span

a809ec9

This can cause rustfix to crash because the `?` suggestion previously could point into non-local spans, such as into the stdlib.

typeck: fix ? operator suggestion span

4606485

test: avoid running rustfix on leaked writeln macro internals test

420e3f1

This test contains conflicting MaybeIncorrect suggestions which will cause the fixed file to not compile.

std: remove sys_common::thread

843cef3

std::net: TcpListener shrinks the backlog argument to 32 for Haiku.

1ce559b

Don't do coroutine-closure-specific upvar analysis if tainted by errors

49e73c3

zkvm: remove cmath

861e213

- Remove cmath from zkvm module since cmath was moved to sys and is shared by all platforms (see rust-lang#120109)

Suppress erroneous suggestion

ddcfb94

The suggestion to use `let else` with an uninitialized refutable `let` statement was erroneous: `let else` cannot be used with deferred initialization.

Add unsafe to two functions with safety invariants

a6ed319

Rollup merge of rust-lang#123807 - joboet:sys_common_thread, r=jhpratt

595a284

Remove `sys_common::thread` Part of rust-lang#117276. The stack size calculation isn't system-specific at all and can just live together with the rest of the spawn logic.

Rollup merge of rust-lang#123834 - compiler-errors:async-closure-with…

1524fe0

…-tainted-body, r=oli-obk Don't do coroutine-closure-specific upvar analysis if tainted by errors See the comment Fixes rust-lang#123821 Fixes rust-lang#123818

Rollup merge of rust-lang#123847 - eggyal:issue-123844, r=fmease

e4c8672

Suppress `let else` suggestion for uninitialized refutable `let`s Fixes rust-lang#123844 r? `@CAD97`

Rollup merge of rust-lang#123857 - devnexen:tcp_listener_update_backl…

fa4c219

…og, r=ChrisDenton std::net: TcpListener shrinks the backlog argument to 32 for Haiku.

Rollup merge of rust-lang#123867 - eduardosm:unsafe-fns, r=ChrisDenton

3026204

Add `unsafe` to two functions with safety invariants

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 Apr 12, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2024

bors merged commit 7942405 into rust-lang:master Apr 12, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Apr 12, 2024

matthiaskrgr deleted the rollup-9kif9c9 branch September 1, 2024 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #123869

Rollup of 7 pull requests #123869

matthiaskrgr commented Apr 12, 2024

matthiaskrgr commented Apr 12, 2024

bors commented Apr 12, 2024

bors commented Apr 12, 2024

bors commented Apr 12, 2024

rust-timer commented Apr 12, 2024

rust-timer commented Apr 13, 2024

Rollup of 7 pull requests #123869

Rollup of 7 pull requests #123869

Conversation

matthiaskrgr commented Apr 12, 2024

matthiaskrgr commented Apr 12, 2024

bors commented Apr 12, 2024

bors commented Apr 12, 2024

bors commented Apr 12, 2024

rust-timer commented Apr 12, 2024

rust-timer commented Apr 13, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size