Rollup of 8 pull requests #120365

matthiaskrgr · 2024-01-26T05:36:40Z

Successful merges:

Add str::Lines::remainder #107464 (Add str::Lines::remainder)
Add the min_exhaustive_patterns feature gate #118803 (Add the min_exhaustive_patterns feature gate)
Initial implementation of str::from_raw_parts[_mut] #119466 (Initial implementation of str::from_raw_parts[_mut])
Specialize Bytes on StdinLock<'_> #120053 (Specialize Bytes on StdinLock<'_>)
Split assembly tests for ELF and MachO #120124 (Split assembly tests for ELF and MachO)
Builtin macros effectively have implicit #[collapse_debuginfo(yes)] #120204 (Builtin macros effectively have implicit #[collapse_debuginfo(yes)])
Don't manually resolve async closures in rustc_resolve #120322 (Don't manually resolve async closures in rustc_resolve)
Fix broken markdown in csky-unknown-linux-gnuabiv2.md #120356 (Fix broken markdown in csky-unknown-linux-gnuabiv2.md)

r? @ghost
@rustbot modify labels: rollup

…der`

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text". Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18. Fixes rust-lang#120105.

…ttribute

…ines, r=dtolnay Add `str::Lines::remainder` Based on rust-lang#98453. This PR adds `str::Lines::remainder` similarly to [other remainder function on str split iterators](rust-lang#77998).

… r=compiler-errors Add the `min_exhaustive_patterns` feature gate ## Motivation Pattern-matching on empty types is tricky around unsafe code. For that reason, current stable rust conservatively requires arms for empty types in all but the simplest case. It has long been the intention to allow omitting empty arms when it's safe to do so. The [`exhaustive_patterns`](rust-lang#51085) feature allows the omission of all empty arms, but hasn't been stabilized because that was deemed dangerous around unsafe code. ## Proposal This feature aims to stabilize an uncontroversial subset of exhaustive_patterns. Namely: when `min_exhaustive_patterns` is enabled and the data we're matching on is guaranteed to be valid by rust's operational semantics, then we allow empty arms to be omitted. E.g.: ```rust let x: Result<T, !> = foo(); match x { // ok Ok(y) => ..., } let Ok(y) = x; // ok ``` If the place is not guaranteed to hold valid data (namely ptr dereferences, ref dereferences (conservatively) and union field accesses), then we keep stable behavior i.e. we (usually) require arms for the empty cases. ```rust unsafe { let ptr: *const Result<u32, !> = ...; match *ptr { Ok(x) => { ... } Err(_) => { ... } // still required } } let foo: Result<u32, &!> = ...; match foo { Ok(x) => { ... } Err(&_) => { ... } // still required because of the dereference } unsafe { let ptr: *const ! = ...; match *ptr {} // already allowed on stable } ``` Note that we conservatively consider that a valid reference can point to invalid data, hence we don't allow arms of type `&!` and similar cases to be omitted. This could eventually change depending on [opsem decisions](rust-lang/unsafe-code-guidelines#413). Whenever opsem is undecided on a case, we conservatively keep today's stable behavior. I proposed this behavior in the [`never_patterns`](rust-lang#118155) feature gate but it makes sense on its own and could be stabilized more quickly. The two proposals nicely complement each other. ## Unresolved Questions Part of the question is whether this requires an RFC. I'd argue this doesn't need one since there is no design question beyond the intent to omit unreachable patterns, but I'm aware the problem can be framed in ways that require design (I'm thinking of the [original never patterns proposal](https://smallcultfollowing.com/babysteps/blog/2018/08/13/never-patterns-exhaustive-matching-and-uninhabited-types-oh-my/), which would frame this behavior as "auto-nevering" happening). EDIT: I initially proposed a future-compatibility lint as part of this feature, I don't anymore.

Initial implementation of `str::from_raw_parts[_mut]` ACP (accepted): rust-lang/libs-team#167 Tracking issue: rust-lang#119206 Thanks to ``@Kixiron`` for previous work on this (rust-lang#107207) ``@rustbot`` label +T-libs-api -T-libs r? ``@thomcc`` Closes rust-lang#107207.

…ytes, r=the8472 Specialize `Bytes` on `StdinLock<'_>` I noticed recently, while profiling a little project, that I was spending a lot of time reading from stdin (even with locking). I was using the `.bytes()` iterator adaptor; I figured, since `StdinLock` is a `BufReader` internally, it would work just as fast. But this is not the case, as `Bytes` is only specialized for the raw `BufReader`, and not the `StdinLock`/`MutexGuard` wrapper. Performance improved significantly when I wrapped the lock in a new `BufReader`, but I was still a bit sore about the double buffer indirection. This PR attempts to specialize it, by simply calling the already specialized implementation on `BufReader`.

Split assembly tests for ELF and MachO On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text". Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18. Fixes rust-lang#120105. r? ```@davidtwco```

…_for_builtin, r=petrochenkov Builtin macros effectively have implicit #[collapse_debuginfo(yes)] If collapse_debuginfo attribute for builtin macro is not specified explicitly, it will be effectively set to `#[collapse_debuginfo(yes)]`.

…c-closures, r=oli-obk Don't manually resolve async closures in `rustc_resolve` There's a comment here that talks about doing this "[so] closure [args] are detected as upvars rather than normal closure arg usages", but we do upvar analysis on the HIR now: https://github.com/rust-lang/rust/blob/cd6d8f2a04528f827ad3d399581c0f3502b15a72/compiler/rustc_passes/src/upvars.rs#L21-L29 Removing this ad-hoc logic makes it so that `async |x: &str|` now introduces an implicit binder, like regular closures. r? ```@oli-obk```

Fix broken markdown in csky-unknown-linux-gnuabiv2.md

matthiaskrgr · 2024-01-26T05:37:12Z

@bors r+ rollup=never p=8

bors · 2024-01-26T05:37:14Z

📌 Commit ee2a2a3 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-26T05:50:19Z

⌛ Testing commit ee2a2a3 with merge dbb1d48...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#107464 (Add `str::Lines::remainder`) - rust-lang#118803 (Add the `min_exhaustive_patterns` feature gate) - rust-lang#119466 (Initial implementation of `str::from_raw_parts[_mut]`) - rust-lang#120053 (Specialize `Bytes` on `StdinLock<'_>`) - rust-lang#120124 (Split assembly tests for ELF and MachO) - rust-lang#120204 (Builtin macros effectively have implicit #[collapse_debuginfo(yes)]) - rust-lang#120322 (Don't manually resolve async closures in `rustc_resolve`) - rust-lang#120356 (Fix broken markdown in csky-unknown-linux-gnuabiv2.md) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-01-26T10:05:19Z

💥 Test timed out

matthiaskrgr · 2024-01-26T10:19:52Z

@bors retry apple timeout

bors · 2024-01-26T10:21:01Z

⌛ Testing commit ee2a2a3 with merge 1fc46f3...

rust-log-analyzer · 2024-01-26T10:21:41Z

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

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

bors · 2024-01-26T12:48:55Z

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

rust-timer · 2024-01-26T12:51:10Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#107464	Add `str::Lines::remainder`	`4cf2675c27e382cec4c20f285f0de266b831f8eb` (link)
#118803	Add the `min_exhaustive_patterns` feature gate	`38b681bacc3e39034762911802a1e691dc0c8a79` (link)
#119466	Initial implementation of `str::from_raw_parts[_mut]`	`94848ce84bf053b9f7c7ca309db1156cfc097a3e` (link)
#120053	Specialize `Bytes` on `StdinLock<'_>`	`4a3c2404a2f9a53cb1caaeaf0836d492c4cfcab6` (link)
#120124	Split assembly tests for ELF and MachO	`80b5b1b8c9c24b762f88a66c4bb796c7cba9e3a8` (link)
#120204	Builtin macros effectively have implicit #[collapse_debugin…	`71548fe8ee4142f108fcf0fb23c4deca581ef210` (link)
#120322	Don't manually resolve async closures in `rustc_resolve`	`4d84de293152e1b5652341fd7a43395f67b6eea0` (link)
#120356	Fix broken markdown in csky-unknown-linux-gnuabiv2.md	`fae11f24ad8d971762d5af829ea373b9dc22b563` (link)

previous master: 69db514ed9

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-01-26T14:03:44Z

Finished benchmarking commit (1fc46f3): 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.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	1

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)	3.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	3.5%	[3.5%, 3.5%]	1
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-4.8%	[-4.8%, -4.8%]	1
All ❌✅ (primary)	0.6%	[-2.6%, 3.9%]	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: 662.651s -> 663.074s (0.06%)
Artifact size: 308.15 MiB -> 308.14 MiB (-0.00%)

WaffleLapkin and others added 18 commits January 30, 2023 10:35

Add str::Lines::remainder

cce93f0

Initial implementation of str::from_raw_parts[_mut]

42afefa

Fix broken markdown in csky-unknown-linux-gnuabiv2.md

c824399

specialize Bytes on StdinLock<'_> by using the underlying `BufRea…

1b9a013

…der`

Don't manually resolve async closures in rustc_resolve

8c2ae80

Add feature gate

886108b

Implement feature gate logic

95a14d4

Split assembly tests for ELF and MachO

8866449

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text". Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18. Fixes rust-lang#120105.

Builtin macros effectively have implicit #[collapse_debuginfo(yes)] a…

27717db

…ttribute

Export core::str::from_raw_parts{,_mut} into alloc::str and std::str

f94a942

Rollup merge of rust-lang#107464 - WaffleLapkin:all_that_remains_of_l…

c0992f5

…ines, r=dtolnay Add `str::Lines::remainder` Based on rust-lang#98453. This PR adds `str::Lines::remainder` similarly to [other remainder function on str split iterators](rust-lang#77998).

Rollup merge of rust-lang#120356 - mbrubeck:patch-2, r=ehuss

ee2a2a3

Fix broken markdown in csky-unknown-linux-gnuabiv2.md

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 26, 2024

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 26, 2024

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2024

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 26, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2024

bors merged commit 1fc46f3 into rust-lang:master Jan 26, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 26, 2024

This was referenced Jan 26, 2024

Add a new wasm32-wasip2 target #119616

Merged

[Experiment] Play with match lowering #119031

Draft

Add buffering to stdout #115652

Closed

Make ReentrantLock public #110543

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #120365

Rollup of 8 pull requests #120365

matthiaskrgr commented Jan 26, 2024

matthiaskrgr commented Jan 26, 2024

bors commented Jan 26, 2024

bors commented Jan 26, 2024

bors commented Jan 26, 2024

matthiaskrgr commented Jan 26, 2024

bors commented Jan 26, 2024

rust-log-analyzer commented Jan 26, 2024

bors commented Jan 26, 2024

rust-timer commented Jan 26, 2024

rust-timer commented Jan 26, 2024

Rollup of 8 pull requests #120365

Rollup of 8 pull requests #120365

Conversation

matthiaskrgr commented Jan 26, 2024

matthiaskrgr commented Jan 26, 2024

bors commented Jan 26, 2024

bors commented Jan 26, 2024

bors commented Jan 26, 2024

matthiaskrgr commented Jan 26, 2024

bors commented Jan 26, 2024

rust-log-analyzer commented Jan 26, 2024

bors commented Jan 26, 2024

rust-timer commented Jan 26, 2024

rust-timer commented Jan 26, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size