Rollup of 7 pull requests #135327

jhpratt · 2025-01-10T08:55:24Z

Successful merges:

Used pthread name functions returning result for FreeBSD and DragonFly #132607 (Used pthread name functions returning result for FreeBSD and DragonFly)
proc_macro: Use ToTokens trait in quote macro #134693 (proc_macro: Use ToTokens trait in quote macro)
Unify conditional-const error reporting with non-const error reporting #134732 (Unify conditional-const error reporting with non-const error reporting)
Do not ICE when encountering predicates from other items in method error reporting #135083 (Do not ICE when encountering predicates from other items in method error reporting)
Only treat plain literal patterns as short #135251 (Only treat plain literal patterns as short)
Fix typo in #[coroutine] gating error #135320 (Fix typo in #[coroutine] gating error)
remove more redundant into() conversions #135321 (remove more redundant into() conversions)

r? @ghost
@rustbot modify labels: rollup

…ror reporting

…esult, r=tgross35 Used pthread name functions returning result for FreeBSD and DragonFly `pthread_getname_np` and `pthread_setname_np` received a wider adoption in past years and was added to: * FreeBSD by June 11 2020 via [`2ef84b7da9a6c3e23b4a135e6e863581f16d46e1`](freebsd/freebsd-src@2ef84b7), * DargonFly by March 8 2021 via [`ab5dc9aceb34419d1c4b6006739e61acee8ee999`](https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/ab5dc9aceb34419d1c4b6006739e61acee8ee999). There's not so much advantage except that the result can be checked in debug builds. Ideally it should be unified with Linux' implementation, but it trims the input.

…-in-quote, r=tgross35 proc_macro: Use `ToTokens` trait in `quote` macro Tracking issues: rust-lang#130977, rust-lang#54722 This PR changed `proc_macro::quote!` to use `ToTokens` trait instead of `TokenStream::from`, and migrated test cases from `quote` crate. r? `@dtolnay` CC `@tgross35`

…const-error-reporting, r=RalfJung Unify conditional-const error reporting with non-const error reporting This PR unifies the error reporting between `ConditionallyConstCall` and `FnCallNonConst` so that the former will refer to syntactical sugar like operators by their sugared name, rather than calling all operators "methods". We achieve this by making the "non-const" part of the error message generic over the "non" part so we can plug in "conditionally" instead. This should ensure that as we constify traits in the standard library, we don't regress error messages for things like `==`. r? fmease or reassign

…source, r=camelid Do not ICE when encountering predicates from other items in method error reporting See the comments I left in the code and the test file. Fixes rust-lang#124350

Only treat plain literal patterns as short See rust-lang#134228 (comment) and rust-lang#134228 (comment) for context. We never wanted to treat const blocks and paths as short, only plain literals. I don't know how to write a test for this, it.s not clear to me how the short pattern check actually affects the formatting

Fix typo in `#[coroutine]` gating error

remove more redundant into() conversions

jhpratt · 2025-01-10T08:55:36Z

@bors r+ rollup=never p=5

bors · 2025-01-10T08:55:39Z

📌 Commit b557f1b has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-01-10T11:41:00Z

⌛ Testing commit b557f1b with merge 252b07b...

bors · 2025-01-10T14:23:25Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 252b07b to master...

rust-timer · 2025-01-10T14:25:30Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#132607	Used pthread name functions returning result for FreeBSD an…	`fd041e077e9a43a7f3b7fe876fd792dcd9d3894f` (link)
#134693	proc_macro: Use `ToTokens` trait in `quote` macro	`2d4a6f4ef201cd1a2508196f8431cba7fd66f7b6` (link)
#134732	Unify conditional-const error reporting with non-const erro…	`437561f32d792d1777e2e647c6ece4b58554e55c` (link)
#135083	Do not ICE when encountering predicates from other items in…	`2f2390db47d646ea09d25ec2d9c68c8531f2643d` (link)
#135251	Only treat plain literal patterns as short	`5c31a1bc54517edf73acaff81d4afca974650dd9` (link)
#135320	Fix typo in `#[coroutine]` gating error	`e5e420fda72052d1fdc6b2c2c04784c61deb2f19` (link)
#135321	remove more redundant into() conversions	`ff0bb16150ef010e865c09dc1f1b15f741028845` (link)

previous master: b44e14f762

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 · 2025-01-10T15:59:26Z

Finished benchmarking commit (252b07b): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.2%, -0.2%]	1

Max RSS (memory usage)

Results (primary 2.0%, secondary -3.0%)

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

Cycles

Results (secondary -2.6%)

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.6%	[-3.0%, -2.3%]	3
All ❌✅ (primary)	-	-	0

Binary size

Results (primary -4.1%, secondary -4.5%)

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)	-4.1%	[-4.4%, -4.0%]	4
Improvements ✅ (secondary)	-4.5%	[-8.6%, -0.4%]	6
All ❌✅ (primary)	-4.1%	[-4.4%, -4.0%]	4

Bootstrap: 762.913s -> 763.605s (0.09%)
Artifact size: 325.74 MiB -> 325.79 MiB (0.01%)

SpriteOvO and others added 20 commits January 1, 2025 20:56

Rename the internal simpler quote macro to minimal_quote

2a2e87b

Do not ICE when encountering predicates from other items in method er…

e4193e2

…ror reporting

Only treat plain literal patterns as short

be92ac3

Add note back to conditionally-const error message

b321cd5

Make the non-const part swappable in the diagnostic

5a9f0be

Unify conditional and non const call error reporting

924000d

Used pthread name functions returning result for FreeBSD and DragonFly

8795750

Append TokenTree with ToTokens in proc_macro::quote!

d525641

Migrate basic tests for proc_macro::quote! from quote crate

e9063c3

Migrate check-fail tests for proc_macro::quote! from quote crate

2ab9db5

Fix proc_macro::quote! for raw ident

ef69c30

Fix typo in #[coroutine] gating error

7c91f89

remove more redundant into() conversions

1c61937

Rollup merge of rust-lang#135083 - compiler-errors:invalid-predicate-…

a6d38a1

…source, r=camelid Do not ICE when encountering predicates from other items in method error reporting See the comments I left in the code and the test file. Fixes rust-lang#124350

Rollup merge of rust-lang#135320 - camelid:coroutines-typo, r=lqd

ee521df

Fix typo in `#[coroutine]` gating error

Rollup merge of rust-lang#135321 - matthiaskrgr:out_of_into, r=lqd

b557f1b

remove more redundant into() conversions

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 10, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 10, 2025

bors merged commit 252b07b into rust-lang:master Jan 10, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 10, 2025

bors mentioned this pull request Jan 10, 2025

Implement trait const stability #133999

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #135327

Rollup of 7 pull requests #135327

jhpratt commented Jan 10, 2025

jhpratt commented Jan 10, 2025

bors commented Jan 10, 2025

bors commented Jan 10, 2025

bors commented Jan 10, 2025

rust-timer commented Jan 10, 2025

rust-timer commented Jan 10, 2025

Rollup of 7 pull requests #135327

Rollup of 7 pull requests #135327

Conversation

jhpratt commented Jan 10, 2025

jhpratt commented Jan 10, 2025

bors commented Jan 10, 2025

bors commented Jan 10, 2025

bors commented Jan 10, 2025

rust-timer commented Jan 10, 2025

rust-timer commented Jan 10, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size