Rollup of 10 pull requests #132094

Zalathar · 2024-10-24T03:19:58Z

Successful merges:

Rename Receiver -> LegacyReceiver #130225 (Rename Receiver -> LegacyReceiver)
Fix target_vendor in QNX Neutrino targets #131169 (Fix target_vendor in QNX Neutrino targets)
misc cleanups #131623 (misc cleanups)
Deeply normalize TypeTrace when reporting type error in new solver #131756 (Deeply normalize TypeTrace when reporting type error in new solver)
minor *dyn cast cleanup #131898 (minor *dyn cast cleanup)
Prevent overflowing enum cast from ICEing #131909 (Prevent overflowing enum cast from ICEing)
Don't allow test revisions that conflict with built in cfgs #131930 (Don't allow test revisions that conflict with built in cfgs)
coverage: Pass coverage mappings to LLVM as separate structs #131956 (coverage: Pass coverage mappings to LLVM as separate structs)
HashStable for rustc_feature::Features: stop hashing compile-time constant #132076 (HashStable for rustc_feature::Features: stop hashing compile-time constant)
Print safety correctly in extern static items #132088 (Print safety correctly in extern static items)

r? @ghost
@rustbot modify labels: rollup

The `x86_64-pc-nto-qnx710` and `i586-pc-nto-qnx700` targets have `pc` in their target triple names, but the vendor was set to the default `"unknown"`.

- remove a redundant check, because we always emit the "better diagnostic" now - clean up the comments a bit

@wesleywiser

As part of the "arbitrary self types v2" project, we are going to replace the current `Receiver` trait with a new mechanism based on a new, different `Receiver` trait. This PR renames the old trait to get it out the way. Naming is hard. Options considered included: * HardCodedReceiver (because it should only be used for things in the standard library, and hence is sort-of hard coded) * LegacyReceiver * TargetLessReceiver * OldReceiver These are all bad names, but fortunately this will be temporary. Assuming the new mechanism proceeds to stabilization as intended, the legacy trait will be removed altogether. Although we expect this trait to be used only in the standard library, we suspect it may be in use elsehwere, so we're landing this change separately to identify any surprising breakages. It's known that this trait is used within the Rust for Linux project; a patch is in progress to remove their dependency. This is a part of the arbitrary self types v2 project, rust-lang/rfcs#3519 rust-lang#44874 r? @wesleywiser

double_parens filter_map_identity needless_question_mark redundant_guards

…esleywiser Rename Receiver -> LegacyReceiver As part of the "arbitrary self types v2" project, we are going to replace the current `Receiver` trait with a new mechanism based on a new, different `Receiver` trait. This PR renames the old trait to get it out the way. Naming is hard. Options considered included: * HardCodedReceiver (because it should only be used for things in the standard library, and hence is sort-of hard coded) * LegacyReceiver * TargetLessReceiver * OldReceiver These are all bad names, but fortunately this will be temporary. Assuming the new mechanism proceeds to stabilization as intended, the legacy trait will be removed altogether. Although we expect this trait to be used only in the standard library, we suspect it may be in use elsehwere, so we're landing this change separately to identify any surprising breakages. It's known that this trait is used within the Rust for Linux project; a patch is in progress to remove their dependency. This is a part of the arbitrary self types v2 project, rust-lang/rfcs#3519 rust-lang#44874 r? `@wesleywiser`

…wesleywiser Fix `target_vendor` in QNX Neutrino targets The `x86_64-pc-nto-qnx710` and `i586-pc-nto-qnx700` targets have `pc` in their target triple names, but the vendor was set to the default `"unknown"`. CC target maintainers `@flba-eb,` `@gh-tr,` `@jonathanpallant` and `@japaric`

misc cleanups

…ype-err, r=lcnr Deeply normalize `TypeTrace` when reporting type error in new solver Normalize the values that come from the `TypeTrace` for various type mismatches. Side-note: We can't normalize the `TypeError` itself bc it may come from instantiated binders, so it may reference values from within the probe... r? lcnr

…piler-errors minor `*dyn` cast cleanup Small follow-up to rust-lang#130234 to remove a redundant check and clean up comments. No functional changes. Also, explain why casts cannot drop the principal even though coercions can, and add a test because apparently we didn't have one already. r? `@WaffleLapkin` or `@compiler-errors`

…mpiler-errors Prevent overflowing enum cast from ICEing Fixes rust-lang#131902

…jieyouxu Don't allow test revisions that conflict with built in cfgs Fixes rust-lang#128964 Sorry `@heysujal` I started working on this about 1 minute before your comment by complete coincidence 😅

…-errors,Swatinem coverage: Pass coverage mappings to LLVM as separate structs Instead of trying to cram *N* different kinds of coverage mapping data into a single list for FFI, pass *N* different lists of simpler structs. This avoids the need to fill unused fields with dummy values, and avoids the need to tag structs with their underlying kind. It also lets us call the dedicated LLVM constructors for each different mapping type, instead of having to go through the complex general-purpose constructor. Even though this adds multiple new structs to the FFI surface area, the resulting C++ code is simpler and shorter. --- I've structured this mostly as a single atomic patch, rather than a series of incremental changes, because that avoids the need to make fiddly fixes to code that is about to be deleted anyway.

…rcote,Mark-Simulacrum HashStable for rustc_feature::Features: stop hashing compile-time constant It seems like back in rust-lang@542bc75 this was added as "hash the boolean value of each lang feature", but then in rust-lang@1487bd6 this got split into first hashing a sequence of `bool`s (representing all the features) and then hashing all the feature names... but the list of feature names is a compile-time constant, so it seems entirely unnecessary to hash them? Cc `@Mark-Simulacrum` who wrote the second of the commits mentioned above. Cc `@nnethercote`

…ieyouxu Print safety correctly in extern static items Fixes rust-lang#132080 r? spastorino or anyone really

Zalathar · 2024-10-24T03:20:27Z

@bors r+ rollup=never p=10

bors · 2024-10-24T03:20:30Z

📌 Commit 7e2bbc3 has been approved by Zalathar

It is now in the queue for this repository.

bors · 2024-10-24T03:24:53Z

⌛ Testing commit 7e2bbc3 with merge 55b7f8e...

bors · 2024-10-24T05:47:49Z

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 55b7f8e to master...

rust-timer · 2024-10-24T05:50:36Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#130225	Rename Receiver -> LegacyReceiver	`2ddcce914b7c880e1239e5ae241bbdebbe96c2be` (link)
#131169	Fix `target_vendor` in QNX Neutrino targets	`e1da772d4f8c76916a2d408ca3317b29b4dd9355` (link)
#131623	misc cleanups	`c930a3f5a857e5309e7b012ce0d6b494dd0e8672` (link)
#131756	Deeply normalize `TypeTrace` when reporting type error in n…	`cf9ebdc882962d90d7af3077716c73c0096c19b5` (link)
#131898	minor `*dyn` cast cleanup	`5f29e0b334ff271a2f4b3e8856c1db70ac04e519` (link)
#131909	Prevent overflowing enum cast from ICEing	`f23700aed6c048ced27a914163f3a04cdd1d0a03` (link)
#131930	Don't allow test revisions that conflict with built in cfgs	`6bd35a3e737722b4b0faf4ede42a74664e337099` (link)
#131956	coverage: Pass coverage mappings to LLVM as separate structs	`cd40b1551b1d43ccee11da105cc6ef38a7f60713` (link)
#132076	HashStable for rustc_feature::Features: stop hashing compil…	`5c6183f86f866a3c4a2d0edf56062445b93f023d` (link)
#132088	Print safety correctly in extern static items	`e35e67451282b3b92f26055c4c4146e446656189` (link)

previous master: b8bb2968ce

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-10-24T12:24:38Z

Finished benchmarking commit (55b7f8e): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

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

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

Max RSS (memory usage)

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

Cycles

Results (primary -0.9%, secondary -0.3%)

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.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-0.9%	[-1.1%, -0.7%]	16
Improvements ✅ (secondary)	-0.9%	[-1.2%, -0.7%]	2
All ❌✅ (primary)	-0.9%	[-1.1%, -0.7%]	16

Binary size

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

Bootstrap: 785.689s -> 780.14s (-0.71%)
Artifact size: 333.63 MiB -> 333.62 MiB (-0.00%)

Zalathar · 2024-10-25T04:37:44Z

I'm not very familiar with perf results, but reducing one family of benchmarks by 0.2% looks like noise to me.

Kobzol · 2024-10-29T19:35:38Z

The tiny regressions to syn were reverted soon after.

@rustbot label: +perf-regression-triaged

madsmtm and others added 25 commits October 2, 2024 19:57

Fix target_vendor in QNX Neutrino targets

7a3a98d

The `x86_64-pc-nto-qnx710` and `i586-pc-nto-qnx700` targets have `pc` in their target triple names, but the vendor was set to the default `"unknown"`.

clean up *dyn casts (with principals)

b89751b

- remove a redundant check, because we always emit the "better diagnostic" now - clean up the comments a bit

Prevent overflowing enum cast from ICEing

ab4222a

Reduce visibility of coverage FFI functions/types

98c4d96

Pass coverage mappings to LLVM as separate structs

d1bf77e

elaborate why dropping principal in *dyn casts is non-trivial

46cc5e9

stop hashing compile-time constant

0304809

Don't allow test revisions that conflict with built in cfgs

2e3091d

fix a couple clippy:complexitys

dab76ec

double_parens filter_map_identity needless_question_mark redundant_guards

fix some manual_map

464f405

clone range in a more obvious way

d84d659

Print safety correctly in extern static items

4e1b3ab

Plumb through param_env to note_type_err

1920c66

Deeply normalize type trace in type error reporting

4217b87

Rollup merge of rust-lang#131623 - matthiaskrgr:clippy_sat, r=Nadrieril

77f2c57

misc cleanups

Rollup merge of rust-lang#131909 - clubby789:enum-overflow-cast, r=co…

4b02d64

…mpiler-errors Prevent overflowing enum cast from ICEing Fixes rust-lang#131902

Rollup merge of rust-lang#131930 - clubby789:revision-cfg-collide, r=…

f7f411d

…jieyouxu Don't allow test revisions that conflict with built in cfgs Fixes rust-lang#128964 Sorry `@heysujal` I started working on this about 1 minute before your comment by complete coincidence 😅

Rollup merge of rust-lang#132088 - compiler-errors:extern-static, r=j…

7e2bbc3

…ieyouxu Print safety correctly in extern static items Fixes rust-lang#132080 r? spastorino or anyone really

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 Oct 24, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 24, 2024

bors merged commit 55b7f8e into rust-lang:master Oct 24, 2024
7 checks passed

rustbot added this to the 1.84.0 milestone Oct 24, 2024

Zalathar deleted the rollup-5r1ppqt branch October 24, 2024 05:59

This was referenced Oct 24, 2024

Add minicore test auxiliary and support //@ add-core-stubs directive in ui/assembly/codegen tests #130693

Merged

Represent trait constness as a distinct predicate #131985

Merged

rustbot added the perf-regression Performance regression. label Oct 24, 2024

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #132094

Rollup of 10 pull requests #132094

Zalathar commented Oct 24, 2024

Zalathar commented Oct 24, 2024

bors commented Oct 24, 2024

bors commented Oct 24, 2024

bors commented Oct 24, 2024

rust-timer commented Oct 24, 2024

rust-timer commented Oct 24, 2024

Zalathar commented Oct 25, 2024

Kobzol commented Oct 29, 2024

Rollup of 10 pull requests #132094

Rollup of 10 pull requests #132094

Conversation

Zalathar commented Oct 24, 2024

Zalathar commented Oct 24, 2024

bors commented Oct 24, 2024

bors commented Oct 24, 2024

bors commented Oct 24, 2024

rust-timer commented Oct 24, 2024

rust-timer commented Oct 24, 2024

Overall result: ❌ regressions - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Zalathar commented Oct 25, 2024

Kobzol commented Oct 29, 2024