Rollup of 10 pull requests #127476

jieyouxu · 2024-07-08T05:04:35Z

Successful merges:

[macro_metavar_expr_concat] Add support for literals #126841 ([macro_metavar_expr_concat] Add support for literals)
Make NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE a deny-by-default lint in edition 2024 #126881 (Make NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE a deny-by-default lint in edition 2024)
Give VaList its own home #126921 (Give VaList its own home)
Run alloc sync tests #127367 (Run alloc sync tests)
Use field ident spans directly instead of the full field span in diagnostics on local fields #127431 (Use field ident spans directly instead of the full field span in diagnostics on local fields)
Uplift trait ref is knowable into rustc_next_trait_solver #127437 (Uplift trait ref is knowable into rustc_next_trait_solver)
Uplift elaboration into rustc_type_ir #127439 (Uplift elaboration into rustc_type_ir)
Improve run-make/output-type-permutations code and improve filename_not_in_denylist API #127451 (Improve run-make/output-type-permutations code and improve filename_not_in_denylist API)
Fix intrinsic const parameter counting with effects #127452 (Fix intrinsic const parameter counting with effects)
rustdoc-json: add type/trait alias tests #127459 (rustdoc-json: add type/trait alias tests)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

and reexport

Now that VaList, et al. have a module, they only need one `#[unstable]`.

…nostics on local fields

…e_not_in_denylist` API

[`macro_metavar_expr_concat`] Add support for literals Adds support for things like `${concat($variable, 123)}` or `${concat("hello", "_world")}` . cc rust-lang#124225

…by-fallback-hard-in-2024, r=compiler-errors Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-default lint in edition 2024 I don't actually really care about this, but ``@traviscross`` asked me to do this, because lang team briefly discussed this before. (TC here:) Specifically, our original FCPed plan included this step: - Add a lint against fallback affecting a generic that is passed to an `unsafe` function. - Perhaps make this lint `deny-by-default` or a hard error in Rust 2024. That is, we had left as an open question strengthening this in Rust 2024, and had marked it as an open question on the tracking issue. We're nominating here to address the open question. (Closing the remaining open question helps us to fully mark this off for Rust 2024.) r? ``@compiler-errors`` Tracking: - rust-lang#123748

…Nilstrieb Give VaList its own home Just rearranging things internally and reexporting.

Run alloc sync tests I was browsing the code and this struck me as weird. We're not running some doc tests because, the comment says, Windows builders deadlock. That should absolutely not happen, at least with our current implementation. And if it does happen I'd like to know. Just to be sure though I'll do some try builds. try-job: x86_64-msvc try-job: i686-msvc try-job: i686-mingw try-job: x86_64-mingw

…r-errors Use field ident spans directly instead of the full field span in diagnostics on local fields This improves diagnostics and avoids having to store the `DefId`s of fields

…s-knowable, r=lcnr Uplift trait ref is knowable into `rustc_next_trait_solver` Self-explanatory. Eliminates one more delegate method. r? lcnr cc ``@fmease``

…r=lcnr Uplift elaboration into `rustc_type_ir` Allows us to deduplicate and consolidate elaboration (including these stupid elaboration duplicate fns i added for pretty printing like 3 years ago) so I'm pretty hyped about this change :3 r? lcnr

…-permutations, r=kobzol Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API r? ``@Kobzol``

…nting, r=fmease Fix intrinsic const parameter counting with `effects` r? project-const-traits

…as_tests, r=aDotInTheVoid rustdoc-json: add type/trait alias tests Not sure if this tests everything there is to test in them though. Updates rust-lang#81359

jieyouxu · 2024-07-08T05:05:07Z

@bors r+ rollup=never p=5

bors · 2024-07-08T05:05:09Z

📌 Commit 76be8f1 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-07-08T06:47:16Z

⌛ Testing commit 76be8f1 with merge 7fdefb8...

bors · 2024-07-08T09:05:40Z

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 7fdefb8 to master...

rust-timer · 2024-07-08T09:08:28Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#126841	[`macro_metavar_expr_concat`] Add support for literals	`ab1828748c22b66d0a5d689511a08664e13557bc` (link)
#126881	Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-de…	`05aa77ad5738c3a9e2d660454292c0ea145a4019` (link)
#126921	Give VaList its own home	`2506e448dfe802bc59008c2f2d3d747e970f427e` (link)
#127367	Run alloc sync tests	`1b950688d0f07708ac0cb2038f30f122240d8fef` (link)
#127431	Use field ident spans directly instead of the full field sp…	`d0cab42c26a38549920633282e0a99f5820301f0` (link)
#127437	Uplift trait ref is knowable into `rustc_next_trait_solver`	`68a4aba8e89534e79d3a687709a6491b139a6c52` (link)
#127439	Uplift elaboration into `rustc_type_ir`	`194c829aa44322a8ee37f88a0a46d822f1c4d881` (link)
#127451	Improve `run-make/output-type-permutations` code and improv…	`2201fbd498c683c2b39f066fe6b8891e7b8c54ab` (link)
#127452	Fix intrinsic const parameter counting with `effects`	`96489e724b6e6ab1e8d9d10e0a05f9999124e904` (link)
#127459	rustdoc-json: add type/trait alias tests	`b080058d77903de45f78f8b10e4795500a52bb05` (link)

previous master: 9af6fee87d

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-07-08T12:03:07Z

Finished benchmarking commit (7fdefb8): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.5%	[0.2%, 1.7%]	15
Regressions ❌ (secondary)	0.3%	[0.1%, 0.7%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	0.5%	[0.2%, 1.7%]	15

Max RSS (memory usage)

Results (primary 2.2%)

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

Cycles

Results (primary -2.2%, secondary -7.7%)

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.3%	[2.1%, 2.6%]	2
Improvements ✅ (primary)	-2.2%	[-3.8%, -1.0%]	7
Improvements ✅ (secondary)	-9.6%	[-13.6%, -5.2%]	10
All ❌✅ (primary)	-2.2%	[-3.8%, -1.0%]	7

Binary size

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

Bootstrap: 699.651s -> 700.455s (0.11%)
Artifact size: 328.40 MiB -> 328.61 MiB (0.06%)

compiler-errors · 2024-07-09T02:46:30Z

Perf regression possibly due to the elaboration PR, testing here: #127439 (comment)

If that is the root cause, I'd say we eat it, since it's mostly doc builds and likely due to the AutoTraitFinder which ought to be rewritten soon.

compiler-errors · 2024-07-09T02:59:08Z

(you might want to kick off some other perf runs to investigate some other PRs -- my advice is to start them in each of their respective prs and cross-link them to here)

Kobzol · 2024-07-09T20:05:18Z

Regression caused by #127439. The regressions are mostly in doc builds, and this is apparently a necessary refactoring. Marking as triaged.

@rustbot label: +perf-regression-triaged

Rollup of 10 pull requests Successful merges: - rust-lang#126841 ([`macro_metavar_expr_concat`] Add support for literals) - rust-lang#126881 (Make `NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE` a deny-by-default lint in edition 2024) - rust-lang#126921 (Give VaList its own home) - rust-lang#127367 (Run alloc sync tests) - rust-lang#127431 (Use field ident spans directly instead of the full field span in diagnostics on local fields) - rust-lang#127437 (Uplift trait ref is knowable into `rustc_next_trait_solver`) - rust-lang#127439 (Uplift elaboration into `rustc_type_ir`) - rust-lang#127451 (Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API) - rust-lang#127452 (Fix intrinsic const parameter counting with `effects`) - rust-lang#127459 (rustdoc-json: add type/trait alias tests) r? `@ghost` `@rustbot` modify labels: rollup

WaffleLapkin and others added 26 commits June 28, 2024 22:23

Make NEVER_TYPE_FALLBACK_FLOWING_INTO_UNSAFE deny-by-default in e2024

18c248b

library: outline VaList into ffi::va_list

c147805

and reexport

core: erase redundant stability attrs in va_list

c1a29b3

Now that VaList, et al. have a module, they only need one `#[unstable]`.

Run alloc sync tests

7566f41

Use field ident spans directly instead of the full field span in diag…

8c2ea71

…nostics on local fields

Add support for literals

c990e00

iter_identity is a better name

58aad3c

Improve run-make/output-type-permutations code and improve `filenam…

39bb14e

…e_not_in_denylist` API

Fix intrinsic const parameter counting with effects

4f54193

rustdoc-json: add trait/type alias tests

8e7314f

Add fundamental to trait def

b2e30bd

Uplift trait_ref_is_knowable and friends

a982471

Get rid of trait_ref_is_knowable from delegate

ab27c2f

Uplift elaboration

90423a7

Get rid of the redundant elaboration in middle

66eb346

Finish uplifting supertraits

15d16f1

Rollup merge of rust-lang#126841 - c410-f3r:concat-again, r=petrochenkov

2c16d65

[`macro_metavar_expr_concat`] Add support for literals Adds support for things like `${concat($variable, 123)}` or `${concat("hello", "_world")}` . cc rust-lang#124225

Rollup merge of rust-lang#126921 - workingjubilee:outline-va-list, r=…

adbcb1a

…Nilstrieb Give VaList its own home Just rearranging things internally and reexporting.

Rollup merge of rust-lang#127431 - oli-obk:feed_item_attrs, r=compile…

bd4ab30

…r-errors Use field ident spans directly instead of the full field span in diagnostics on local fields This improves diagnostics and avoids having to store the `DefId`s of fields

Rollup merge of rust-lang#127437 - compiler-errors:uplift-trait-ref-i…

928d71f

…s-knowable, r=lcnr Uplift trait ref is knowable into `rustc_next_trait_solver` Self-explanatory. Eliminates one more delegate method. r? lcnr cc ``@fmease``

Rollup merge of rust-lang#127451 - GuillaumeGomez:improve-output-type…

0332834

…-permutations, r=kobzol Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API r? ``@Kobzol``

Rollup merge of rust-lang#127452 - fee1-dead-contrib:fx-intrinsic-cou…

73593b9

…nting, r=fmease Fix intrinsic const parameter counting with `effects` r? project-const-traits

Rollup merge of rust-lang#127459 - its-the-shrimp:rustdocjson_add_ali…

76be8f1

…as_tests, r=aDotInTheVoid rustdoc-json: add type/trait alias tests Not sure if this tests everything there is to test in them though. Updates rust-lang#81359

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 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 Jul 8, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 8, 2024

bors merged commit 7fdefb8 into rust-lang:master Jul 8, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jul 8, 2024

jieyouxu deleted the rollup-16wyb0b branch July 8, 2024 09:20

This was referenced Jul 8, 2024

Give RPITITs variances, so they can (not) capture lifetimes #124029

Closed

Encode ADT flags rather than recreating them from scratch at decoding time #127466

Closed

rustbot added the perf-regression Performance regression. label Jul 8, 2024

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #127476

Rollup of 10 pull requests #127476

jieyouxu commented Jul 8, 2024

jieyouxu commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

rust-timer commented Jul 8, 2024

rust-timer commented Jul 8, 2024

compiler-errors commented Jul 9, 2024

compiler-errors commented Jul 9, 2024

Kobzol commented Jul 9, 2024

Rollup of 10 pull requests #127476

Rollup of 10 pull requests #127476

Conversation

jieyouxu commented Jul 8, 2024

jieyouxu commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

rust-timer commented Jul 8, 2024

rust-timer commented Jul 8, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

compiler-errors commented Jul 9, 2024

compiler-errors commented Jul 9, 2024

Kobzol commented Jul 9, 2024