Rollup of 6 pull requests by matthiaskrgr · Pull Request #116372 · rust-lang/rust

matthiaskrgr · 2023-10-03T06:58:51Z

Successful merges:

add notes about non-compliant FP behavior on 32bit x86 targets #113053 (add notes about non-compliant FP behavior on 32bit x86 targets)
For a single impl candidate, try to unify it with error trait ref #115726 (For a single impl candidate, try to unify it with error trait ref)
Don't suggest nonsense suggestions for unconstrained type vars in note_source_of_type_mismatch_constraint #116158 (Don't suggest nonsense suggestions for unconstrained type vars in note_source_of_type_mismatch_constraint)
Add must_use on pointer equality functions #116351 (Add must_use on pointer equality functions)
Clarify float rounding direction for signed zero #116355 (Clarify float rounding direction for signed zero)
Bump stdarch submodule #116361 (Bump stdarch submodule)

r? @ghost
@rustbot modify labels: rollup

…e_source_of_type_mismatch_constraint

…bilee add notes about non-compliant FP behavior on 32bit x86 targets Based on ton of prior discussion (see all the issues linked from rust-lang/unsafe-code-guidelines#237), the consensus seems to be that these targets are simply cursed and we cannot implement the desired semantics for them. I hope I properly understood what exactly the extent of the curse is here, let's make sure people with more in-depth FP knowledge take a close look! In particular for the tier 3 targets I have no clue which target is affected by which particular variant of the x86_32 FP curse. I assumed that `i686` meant SSE is used so the "floating point return value" is the only problem, while everything lower (`i586`, `i386`) meant x87 is used. I opened rust-lang#114479 to concisely describe and track the issue. Cc `@workingjubilee` `@thomcc` `@chorman0773` `@rust-lang/opsem` Fixesrust-lang#73288Fixesrust-lang#72327

…r=estebank For a single impl candidate, try to unify it with error trait ref This allows us to point out an exact type mismatch when there's only one applicable impl. cc `@asquared31415` r? `@estebank`

…-var-sugg, r=wesleywiser Don't suggest nonsense suggestions for unconstrained type vars in `note_source_of_type_mismatch_constraint` The way we do type inference for suggestions in `note_source_of_type_mismatch_constraint` is a bit strange. We compute the "ideal" method signature, which takes the receiver that we *want* and uses it to compute the types of the arguments that would have given us that receiver via type inference, and use *that* to suggest how to change an argument to make sure our receiver type is inferred correctly. The problem is that sometimes we have totally unconstrained arguments (well, they're constrained by things outside of the type checker per se, like associated types), and therefore type suggestions are happy to coerce anything to that unconstrained argument. This leads to bogus suggestions, like rust-lang#116155. This is partly due to above, and partly due to the fact that `emit_type_mismatch_suggestions` doesn't double check that its suggestions are actually compatible with the program other than trying to satisfy the type mismatch. This adds a hack to make sure that at least the types are fully constrained, but I guess I could also rip out this logic altogether. There would be some sad diagnostics regressions though, such as `tests/ui/type/type-check/point-at-inference-4.rs`. Fixesrust-lang#116155

…orkingjubilee Add `must_use` on pointer equality functions `ptr == ptr` (like all use of `==`) has a similar warning, and these functions are simple convenience wrappers over that.

…thomcc Clarify float rounding direction for signed zero Closesrust-lang#116339.

Bump stdarch submodule r? `@Amanieu`

matthiaskrgr · 2023-10-03T06:59:37Z

@bors r+ rollup=never p=6

bors · 2023-10-03T06:59:39Z

📌 Commit c3daf77 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-03T07:10:10Z

⌛ Testing commit c3daf77 with merge 9998f4a...

bors · 2023-10-03T08:52:52Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 9998f4a to master...

rust-timer · 2023-10-03T08:54:36Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#113053	add notes about non-compliant FP behavior on 32bit x86 targ…	`2aeefe201aa9c6b9587d3777cf2603f237c746b1` (link)
#115726	For a single impl candidate, try to unify it with error tra…	`c02046745d0c7d5d81a75ff0632b442af9c32de5` (link)
#116158	Don't suggest nonsense suggestions for unconstrained type v…	`78879414916f73e268216748d00b578153a24a2d` (link)
#116351	Add `must_use` on pointer equality functions	`ee2cbe768901e276a4db8ba8639557915e7b3228` (link)
#116355	Clarify float rounding direction for signed zero	`f598155a3a6bf42baa4f0951db883ea9f8e0e207` (link)
#116361	Bump stdarch submodule	`39f97d19fdc75fc12b8722e132cc98311c6389b9` (link)

previous master: 4f75af9e19

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 · 2023-10-03T10:15:04Z

Finished benchmarking commit (9998f4a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

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

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

Binary size

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

Bootstrap: 622.78s -> 623.042s (0.04%)
Artifact size: 271.96 MiB -> 271.97 MiB (0.00%)

asquared31415and others added 13 commits October 2, 2023 15:10

add must_use on pointer equality functions
34ea540

Clarify float rounding direction for signed zero
07e9631

Don't suggest nonsense suggestions for unconstrained type vars in not…
ac5aa8c
…e_source_of_type_mismatch_constraint

Bump stdarch submodule
f2918b4

For a single impl candidate, try to unify it with error trait ref
8be12f4

Point out the actual mismatch error
0785167

add notes about non-compliant FP behavior on 32bit x86 targets
df911df

Rollup merge ofrust-lang#115726- compiler-errors:better-error-ref, …
ff3b15e
…r=estebank For a single impl candidate, try to unify it with error trait ref This allows us to point out an exact type mismatch when there's only one applicable impl. cc `@asquared31415` r? `@estebank`

Rollup merge ofrust-lang#116351- asquared31415:ptr_eq_must_use, r=w…
cebe393
…orkingjubilee Add `must_use` on pointer equality functions `ptr == ptr` (like all use of `==`) has a similar warning, and these functions are simple convenience wrappers over that.

Rollup merge ofrust-lang#116355- orlp:signed-zero-rounding-mode, r=…
043fcc4
…thomcc Clarify float rounding direction for signed zero Closesrust-lang#116339.

Rollup merge ofrust-lang#116361- eduardosm:bump-stdarch, r=Amanieu
c3daf77
Bump stdarch submodule r? `@Amanieu`

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 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2023

bors merged commit 9998f4a into rust-lang:masterOct 3, 2023

rustbot added this to the 1.75.0 milestone Oct 3, 2023

This was referenced Oct 3, 2023
Update dist-various linux-gnu target baselines #114189
Closed
Show more information when multiple impls apply #114811
Merged
Add more diagnostic items for clippy #116198
Merged

pvdrz mentioned this pull request Oct 4, 2023
Fix divergence from upstream masterferrocene/ferrocene#23
Merged

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

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #116372

Rollup of 6 pull requests#116372
bors merged 13 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ee9oxxa

matthiaskrgr commented Oct 3, 2023

Uh oh!

matthiaskrgr commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

rust-timer commented Oct 3, 2023

Uh oh!

rust-timer commented Oct 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Oct 3, 2023

Uh oh!

matthiaskrgr commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

bors commented Oct 3, 2023

Uh oh!

rust-timer commented Oct 3, 2023

Uh oh!

rust-timer commented Oct 3, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants