Rollup of 9 pull requests #120524

Nadrieril · 2024-01-31T11:10:54Z

Successful merges:

check RUST_BOOTSTRAP_CONFIG in profile_user_dist test #120207 (check RUST_BOOTSTRAP_CONFIG in profile_user_dist test)
pattern_analysis: cleanup the contexts #120321 (pattern_analysis: cleanup the contexts)
document FromIterator for Vec allocation behaviors #120355 (document FromIterator for Vec allocation behaviors)
std: thread_local::register_dtor fix proposal for FreeBSD. #120430 (std: thread_local::register_dtor fix proposal for FreeBSD.)
Provide more context on derived obligation error primary label #120469 (Provide more context on derived obligation error primary label)
Make duplicate lang items fatal #120472 (Make duplicate lang items fatal)
Don't hash lints differently to non-lints. #120490 (Don't hash lints differently to non-lints.)
Remove the abi_amdgpu_kernel feature #120495 (Remove the abi_amdgpu_kernel feature)
rustdoc: Correctly handle attribute merge if this is a glob reexport #120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

r? @ghost
@rustbot modify labels: rollup

following-up 5d3d347 commit, rust started to spin __cxa_thread_call_dtors warnings even without any TLS usage. using instead home made TLS destructor handler `register_dtor_fallback`. close rust-lang#120413

Prevents terminal spam.

The test was using an internal feature which doesn't really matter, but more importantly, we're now fatally exiting after the duplicate lang item, so this tests nothing.

Signed-off-by: onur-ozkan <[email protected]>

`Diagnostic::keys`, which is used for hashing and equating diagnostics, has a surprising behaviour: it ignores children, but only for lints. This was added in rust-lang#88493 to fix some duplicated diagnostics, but it doesn't seem necessary any more. This commit removes the special case and only four tests have changed output, with additional errors. And those additional errors aren't exact duplicates, they're just similar. For example, in src/tools/clippy/tests/ui/same_name_method.rs we currently have this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:79:9 | LL | impl T1 for S {} | ^^^^^^^^^^^^^^^^ ``` and with this change we also get this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:81:9 | LL | impl T2 for S {} | ^^^^^^^^^^^^^^^^ ``` I think printing this second argument is reasonable, possibly even preferable to hiding it. And the other cases are similar.

Expand the primary span of E0277 when the immediate unmet bound is not what the user wrote: ``` error[E0277]: the trait bound `i32: Bar` is not satisfied --> f100.rs:6:6 | 6 | <i32 as Foo>::foo(); | ^^^ the trait `Bar` is not implemented for `i32`, which is required by `i32: Foo` | help: this trait has no implementations, consider adding one --> f100.rs:2:1 | 2 | trait Bar {} | ^^^^^^^^^ note: required for `i32` to implement `Foo` --> f100.rs:3:14 | 3 | impl<T: Bar> Foo for T {} | --- ^^^ ^ | | | unsatisfied trait bound introduced here ``` Fix rust-lang#40120.

Co-authored-by: Josh Stone <[email protected]>

check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test Fixes a logical bug in `profile_user_dist` test (explained in rust-lang#120202).

…rrors pattern_analysis: cleanup the contexts This cleans up a bit the various `*Ctxt`s I had left lying around. As a bonus this made it possible to make `PatternColumn` public. I don't have a use for that yet but that could come useful. `UsefulnessCtxt` looks useless right now but I'll be adding a field or two in subsequent PRs. r? `````@compiler-errors`````

document `FromIterator for Vec` allocation behaviors [t-libs discussion](https://rust-lang.zulipchat.com/#narrow/stream/259402-t-libs.2Fmeetings/topic/Meeting.202024-01-24/near/417686526) about rust-lang#120091 didn't reach a strong consensus, but it was agreed that if we keep the current behavior it should at least be documented even though it is an implementation detail. The language is intentionally non-committal. The previous (non-existent) documentation permits a lot of implementation leeway and we want retain that. In some cases we even must retain it to be able to rip out some code paths that rely on unstable features.

std: thread_local::register_dtor fix proposal for FreeBSD. following-up 5d3d347 commit, rust started to spin __cxa_thread_call_dtors warnings even without any TLS usage. using instead home made TLS destructor handler `register_dtor_fallback`. close rust-lang#120413

Provide more context on derived obligation error primary label Expand the primary span of E0277 when the immediate unmet bound is not what the user wrote: ``` error[E0277]: the trait bound `i32: Bar` is not satisfied --> f100.rs:6:6 | 6 | <i32 as Foo>::foo(); | ^^^ the trait `Bar` is not implemented for `i32`, which is required by `i32: Foo` | help: this trait has no implementations, consider adding one --> f100.rs:2:1 | 2 | trait Bar {} | ^^^^^^^^^ note: required for `i32` to implement `Foo` --> f100.rs:3:14 | 3 | impl<T: Bar> Foo for T {} | --- ^^^ ^ | | | unsatisfied trait bound introduced here ``` Fix rust-lang#40120.

Make duplicate lang items fatal Prevents terminal spam.

…estebank Don't hash lints differently to non-lints. `Diagnostic::keys`, which is used for hashing and equating diagnostics, has a surprising behaviour: it ignores children, but only for lints. This was added in rust-lang#88493 to fix some duplicated diagnostics, but it doesn't seem necessary any more. This commit removes the special case and only four tests have changed output, with additional errors. And those additional errors aren't exact duplicates, they're just similar. For example, in src/tools/clippy/tests/ui/same_name_method.rs we currently have this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:79:9 | LL | impl T1 for S {} | ^^^^^^^^^^^^^^^^ ``` and with this change we also get this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:81:9 | LL | impl T2 for S {} | ``` I think printing this second argument is reasonable, possibly even preferable to hiding it. And the other cases are similar. r? `@estebank`

…oli-obk Remove the `abi_amdgpu_kernel` feature The tracking issue (rust-lang#51575) has been closed for 3 years, with no activity for 5.

…merge-bugfix, r=notriddle rustdoc: Correctly handle attribute merge if this is a glob reexport Fixes rust-lang#120487. The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted. cc `````@Nemo157````` r? `````@notriddle`````

Nadrieril · 2024-01-31T11:11:40Z

@bors r+ rollup=never p=5

bors · 2024-01-31T11:11:43Z

📌 Commit 4eaf4c2 has been approved by Nadrieril

It is now in the queue for this repository.

bors · 2024-01-31T15:01:25Z

⌛ Testing commit 4eaf4c2 with merge 11f32b7...

bors · 2024-01-31T17:46:58Z

☀️ Test successful - checks-actions
Approved by: Nadrieril
Pushing 11f32b7 to master...

rust-timer · 2024-01-31T17:49:30Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#120207	check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test	`bb57aa660e7695cc71f4dd3d3e77523ba3ccd7bd` (link)
#120321	pattern_analysis: cleanup the contexts	`9197d77d036fcb85363efb6ed81dba9704ba57ee` (link)
#120355	document `FromIterator for Vec` allocation behaviors	`f37f0e44ab2f6069ea05fc8eecc331e8ee255d33` (link)
#120430	std: thread_local::register_dtor fix proposal for FreeBSD.	`059fc0b5817deeb420bd9deeb23d3272c1517420` (link)
#120469	Provide more context on derived obligation error primary la…	`3ef529135f097e122a374a72ab36802843e5a118` (link)
#120472	Make duplicate lang items fatal	`48620d1c5133e57114fa1b6004e849c1365d8ffa` (link)
#120490	Don't hash lints differently to non-lints.	`051f8e5bd4efd0b4923c72a927e6d055e931b838` (link)
#120495	Remove the `abi_amdgpu_kernel` feature	`112185a7b9fbb5f1b1f4c25da95d0b8e3796cf59` (link)
#120501	rustdoc: Correctly handle attribute merge if this is a glob…	`e768039934ecdb05981df08e4460d082a85ac040` (link)

previous master: cdaa12e3df

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-31T19:02:22Z

Finished benchmarking commit (11f32b7): 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)	2.8%	[2.8%, 2.8%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.8%	[2.8%, 2.8%]	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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.5%	[-3.7%, -1.2%]	9
Improvements ✅ (secondary)	-2.8%	[-3.8%, -0.8%]	32
All ❌✅ (primary)	-2.5%	[-3.7%, -1.2%]	9

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

Binary size

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

Bootstrap: 661.871s -> 662.648s (0.12%)
Artifact size: 308.09 MiB -> 308.09 MiB (0.00%)

Nadrieril · 2024-01-31T19:06:38Z

Trying #120495

@rust-timer build 112185a

rust-timer · 2024-02-02T00:18:45Z

Finished benchmarking commit (112185a): comparison URL.

Overall result: no relevant changes - no action needed

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)	-	-	0
Regressions ❌ (secondary)	1.5%	[1.5%, 1.5%]	1
Improvements ✅ (primary)	-2.8%	[-2.8%, -2.8%]	1
Improvements ✅ (secondary)	-3.1%	[-3.4%, -2.8%]	5
All ❌✅ (primary)	-2.8%	[-2.8%, -2.8%]	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)	-1.0%	[-1.0%, -1.0%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.0%	[-1.0%, -1.0%]	1

Binary size

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

Bootstrap: 661.871s -> 660.47s (-0.21%)
Artifact size: 308.09 MiB -> 308.11 MiB (0.01%)

Nadrieril · 2024-02-03T00:54:26Z

Trying #120490

@rust-timer build 051f8e5

rust-timer · 2024-02-03T02:11:02Z

Finished benchmarking commit (051f8e5): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

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

Max RSS (memory usage)

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

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

Binary size

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

Bootstrap: 661.871s -> 662.418s (0.08%)
Artifact size: 308.09 MiB -> 308.10 MiB (0.00%)

Nadrieril · 2024-02-03T23:54:47Z

Trying #120321

@rust-timer build 9197d77

rust-timer · 2024-02-04T01:09:22Z

Finished benchmarking commit (9197d77): comparison URL.

Overall result: ❌ regressions - no action needed

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)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.7%	[2.7%, 2.7%]	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)	2.9%	[2.9%, 2.9%]	1
Regressions ❌ (secondary)	2.2%	[2.1%, 2.3%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.6%	[-3.6%, -3.6%]	1
All ❌✅ (primary)	2.9%	[2.9%, 2.9%]	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)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.7%	[2.7%, 2.7%]	1

Binary size

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

Bootstrap: 661.871s -> 661.956s (0.01%)
Artifact size: 308.09 MiB -> 308.10 MiB (0.00%)

Nadrieril · 2024-02-04T04:40:17Z

Regression is from #120321 on a primary benchmark. The benchmark shows a regression on opt but not debug or check, yet #120321 could only affect the check phase so I'm confused.

devnexen and others added 26 commits January 27, 2024 19:14

std: thread_local::register_dtor fix proposal for FreeBSD.

4c01025

following-up 5d3d347 commit, rust started to spin __cxa_thread_call_dtors warnings even without any TLS usage. using instead home made TLS destructor handler `register_dtor_fallback`. close rust-lang#120413

Make duplicate lang items fatal

ad1e629

Prevents terminal spam.

Delete now-useless test

a360ecd

The test was using an internal feature which doesn't really matter, but more importantly, we're now fatally exiting after the duplicate lang item, so this tests nothing.

Add test for duplicate lang items

1f89e90

Remove the abi_amdgpu_kernel feature

f6b21e9

Make PatternColumn generic in Cx

0b2579a

Limit the use of PlaceCtxt

cb0e8c5

Repurpose MatchCtxt for usefulness only

83e88c6

Make PatternColumn part of the public API

6ef8362

Separate PlaceCtxt from UsefulnessCtxt

5903142

check RUST_BOOTSTRAP_CONFIG in profile_user_dist test

dfbbdda

Signed-off-by: onur-ozkan <[email protected]>

rustdoc: Correctly handle attribute merge if this is a glob reexport

75f670d

Add regression test for rust-lang#120487

024364a

document FromIterator for Vec allocation behaviors

c780fe6

Apply suggestions from code review

39dc315

Co-authored-by: Josh Stone <[email protected]>

Rollup merge of rust-lang#120207 - onur-ozkan:120202-fix, r=clubby789

bcb709b

check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test Fixes a logical bug in `profile_user_dist` test (explained in rust-lang#120202).

Rollup merge of rust-lang#120472 - Nilstrieb:die, r=compiler-errors

032596e

Make duplicate lang items fatal Prevents terminal spam.

Rollup merge of rust-lang#120495 - clubby789:remove-amdgpu-kernel, r=…

573e7f1

…oli-obk Remove the `abi_amdgpu_kernel` feature The tracking issue (rust-lang#51575) has been closed for 3 years, with no activity for 5.

rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 31, 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 31, 2024

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

bors merged commit 11f32b7 into rust-lang:master Jan 31, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 31, 2024

bors mentioned this pull request Jan 31, 2024

Lint singleton gaps after exclusive ranges #118879

Merged

Nadrieril deleted the rollup-67952ib branch January 31, 2024 18:21

This comment has been minimized.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #120524

Rollup of 9 pull requests #120524

Nadrieril commented Jan 31, 2024

Nadrieril commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Jan 31, 2024

rust-timer commented Jan 31, 2024

rust-timer commented Jan 31, 2024

Nadrieril commented Jan 31, 2024

This comment has been minimized.

rust-timer commented Feb 2, 2024

Nadrieril commented Feb 3, 2024

This comment has been minimized.

rust-timer commented Feb 3, 2024

Nadrieril commented Feb 3, 2024

This comment has been minimized.

rust-timer commented Feb 4, 2024

Nadrieril commented Feb 4, 2024

Rollup of 9 pull requests #120524

Rollup of 9 pull requests #120524

Conversation

Nadrieril commented Jan 31, 2024

Nadrieril commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Jan 31, 2024

rust-timer commented Jan 31, 2024

rust-timer commented Jan 31, 2024

Overall result: ❌ regressions - no action needed

Nadrieril commented Jan 31, 2024

This comment has been minimized.

rust-timer commented Feb 2, 2024

Overall result: no relevant changes - no action needed

Nadrieril commented Feb 3, 2024

This comment has been minimized.

rust-timer commented Feb 3, 2024

Overall result: no relevant changes - no action needed

Nadrieril commented Feb 3, 2024

This comment has been minimized.

rust-timer commented Feb 4, 2024

Overall result: ❌ regressions - no action needed

Nadrieril commented Feb 4, 2024