Rollup of 5 pull requests #116640

matthiaskrgr · 2023-10-11T18:08:23Z

Successful merges:

Relate alias ty with variance #116219 (Relate alias ty with variance)
Do not check for impossible predicates in const-prop lint. #116315 (Do not check for impossible predicates in const-prop lint.)
Structurally normalize for closure #116436 (Structurally normalize for closure)
Prevent showing methods from blanket impls of not available foreign traits to show up in the search results #116597 (Prevent showing methods from blanket impls of not available foreign traits to show up in the search results)
small cleanup #116627 (small cleanup)

r? @ghost
@rustbot modify labels: rollup

…rom_obligations

…raits to show up in the search results

…th-variance, r=lcnr Relate alias ty with variance In the new solver, turns out that the subst-relate branch of the alias-relate predicate was relating args invariantly even for opaques, which have variance 💀. This change is a bit more invasive, but I'd rather not special-case it [here](https://github.com/rust-lang/rust/blob/aeaa5c30e5c9041264a2e8314b68ad84c2dc3169/compiler/rustc_trait_selection/src/solve/alias_relate.rs#L171-L190) and then have it break elsewhere. I'm doing a perf run to see if the extra call to `def_kind` is that expensive, if it is, I'll reconsider. r? ``@lcnr``

Do not check for impossible predicates in const-prop lint. The enclosing query already checks for them, and replaces the body with a single `unreachable` if they are indeed impossible.

…lize-for-closure, r=lcnr Structurally normalize for closure Fixes some signature deduction problems in the new trait solver (and in the case of async, an ICE). r? lcnr

…l, r=notriddle Prevent showing methods from blanket impls of not available foreign traits to show up in the search results Fixes rust-lang#115480. In the case that the blanket impl trait is not available in the current crate, we prevent adding its methods in the search index. Now how I found how to fix the issue: the `equivalent` method is not generated in the documentation pages but was still added to the search index. To render impls, we iterate over `cache.impls` so I took a look at how this was generated. Inside `formats/cache.rs`, we have `CacheBuilder::populate` where we push impls into `impls` but with this condition: ```rust if cx.cache.traits.contains_key(&trait_did) { ``` I re-used this condition in `CacheBuilder::fold_item` to prevent this method from being added in `cache.search_index` or `cache.orphan_impl_items`. PS: If you want to double-check if the added test works, just comment the code I added in `cache.rs` and it should fail. r? ``@notriddle``

…orino small cleanup this is exactly the same as the `lower_param_bounds` function, so use that instead

matthiaskrgr · 2023-10-11T18:08:37Z

@bors r+ rollup=never p=5

bors · 2023-10-11T18:08:39Z

📌 Commit 8374805 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-11T19:02:52Z

⌛ Testing commit 8374805 with merge 475c71d...

bors · 2023-10-11T20:50:03Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 475c71d to master...

rust-timer · 2023-10-11T20:51:31Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116219	Relate alias ty with variance	`ae64746194d5617d58e8cf5065a9b146dfc74a06` (link)
#116315	Do not check for impossible predicates in const-prop lint.	`7196001ea00867241c9802b7b3b7a2189a7b9dbb` (link)
#116436	Structurally normalize for closure	`35c37d068eb9a113296de215a03c4fcdf748461e` (link)
#116597	Prevent showing methods from blanket impls of not available…	`07eb13dc319b349f8093fb21b1f981f083ce9c75` (link)
#116627	small cleanup	`1e1e625cedbc216d0fdbd4f67c55a6633da8a599` (link)

previous master: c1691db366

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-11T22:12:00Z

Finished benchmarking commit (475c71d): 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
Regressions ❌ (secondary)	1.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-0.3%	[-0.4%, -0.2%]	4
Improvements ✅ (secondary)	-0.4%	[-0.5%, -0.4%]	6
All ❌✅ (primary)	-0.3%	[-0.4%, -0.2%]	4

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)	3.5%	[3.5%, 3.5%]	1
Regressions ❌ (secondary)	2.0%	[1.4%, 2.7%]	2
Improvements ✅ (primary)	-1.4%	[-1.4%, -1.4%]	1
Improvements ✅ (secondary)	-2.7%	[-5.2%, -1.5%]	3
All ❌✅ (primary)	1.1%	[-1.4%, 3.5%]	2

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

Binary size

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

Bootstrap: 628.448s -> 626.264s (-0.35%)
Artifact size: 271.30 MiB -> 271.33 MiB (0.01%)

pnkfelix · 2023-10-18T21:06:58Z

Visiting for weekly perf triage

sole regression was to secondary benchmark coercions debug incr-patched: add static arr item
Looks like a blip (i.e. noise) based on the graph over time.
marking as triaged

@rustbot label: +perf-regression-triaged

cjgillot and others added 18 commits October 1, 2023 14:00

Use DefKind to check for generator.

fd51cc6

Do not check for impossible predicates in const-prop lint.

7e1ecff

Rename lint pass.

b1bef90

Remove outdated comment.

465a82f

Relate AliasTy considering variance

5087bb1

Remove unnecessary relate impl

cdef3b1

Make it clear that args default to being related invariantly

be29d22

Structurally normalize async fn return type in deduce_future_output_f…

966f279

…rom_obligations

Also closures

dfbb1bf

small cleanup

50b6f46

Prevent showing methods from blanket impls of not available foreign t…

a314707

…raits to show up in the search results

Add regression test for rust-lang#115480

efac0b9

Handle private dep at the same level as masked crates

2d37b00

Rollup merge of rust-lang#116315 - cjgillot:cpl-clean, r=petrochenkov

9b7e0af

Do not check for impossible predicates in const-prop lint. The enclosing query already checks for them, and replaces the body with a single `unreachable` if they are indeed impossible.

Rollup merge of rust-lang#116436 - compiler-errors:structurally-norma…

3712ea8

…lize-for-closure, r=lcnr Structurally normalize for closure Fixes some signature deduction problems in the new trait solver (and in the case of async, an ICE). r? lcnr

Rollup merge of rust-lang#116627 - fee1-dead-contrib:cleanup, r=spast…

8374805

…orino small cleanup this is exactly the same as the `lower_param_bounds` function, so use that instead

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

bors mentioned this pull request Oct 11, 2023

Pass rustc shim flags using environment variable #116448

Merged

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

bors merged commit 475c71d into rust-lang:master Oct 11, 2023

rustbot added this to the 1.75.0 milestone Oct 11, 2023

rustbot added the perf-regression Performance regression. label Oct 11, 2023

Dajamante mentioned this pull request Oct 12, 2023

Pull upstream master 2023 10 12 ferrocene/ferrocene#48

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 18, 2023

matthiaskrgr deleted the rollup-xt9r5ir branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #116640

Rollup of 5 pull requests #116640

Uh oh!

matthiaskrgr commented Oct 11, 2023

Uh oh!

matthiaskrgr commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

rust-timer commented Oct 11, 2023

Uh oh!

rust-timer commented Oct 11, 2023

Uh oh!

pnkfelix commented Oct 18, 2023

Uh oh!

Uh oh!

Rollup of 5 pull requests #116640

Rollup of 5 pull requests #116640

Uh oh!

Conversation

matthiaskrgr commented Oct 11, 2023

Uh oh!

matthiaskrgr commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

bors commented Oct 11, 2023

Uh oh!

rust-timer commented Oct 11, 2023

Uh oh!

rust-timer commented Oct 11, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

pnkfelix commented Oct 18, 2023

Uh oh!

Uh oh!