Rollup of 8 pull requests #117013

matthiaskrgr · 2023-10-21T08:08:19Z

Successful merges:

std: freebsd build update. #114521 (std: freebsd build update.)
Suggest relaxing implicit type Assoc: Sized; bound #116911 (Suggest relaxing implicit type Assoc: Sized; bound)
coverage: Simplify the injection of coverage statements #116917 (coverage: Simplify the injection of coverage statements)
Typo suggestion to change bindings with leading underscore #116961 (Typo suggestion to change bindings with leading underscore)
Add stable Instance::body() and RustcInternal trait #116964 (Add stable Instance::body() and RustcInternal trait)
coverage: Fix inconsistent handling of function signature spans #116974 (coverage: Fix inconsistent handling of function signature spans)
Mention into_iter on borrow errors suggestions when appropriate #116990 (Mention into_iter on borrow errors suggestions when appropriate)
Point at assoc fn definition on type param divergence #116995 (Point at assoc fn definition on type param divergence)

r? @ghost
@rustbot modify labels: rollup

The `Instance::body()` returns a monomorphized body. For that, we had to implement visitor that monomorphize types and constants. We are also introducing the RustcInternal trait that will allow us to convert back from Stable to Internal. Note that this trait is not yet visible for our users as it depends on Tables. We should probably add a new trait that can be exposed.

since freebsd 11 had been removed, minimum is now 12.

When encountering a binding that isn't found but has a typo suggestion for a binding with a leading underscore, suggest changing the binding definition instead of the use place. Fix rust-lang#60164.

If we encounter a borrow error on `vec![1, 2, 3].iter()`, suggest `into_iter`. Fix rust-lang#68445.

When the number of type parameters in the associated function of an impl and its trait differ, we now *always* point at the trait one, even if it comes from a foreign crate. When it is local, we point at the specific params, when it is foreign, we point at the whole associated item. Fix rust-lang#69944.

…gnatures

std: freebsd build update. since freebsd 11 had been removed, minimum is now 12.

Suggest relaxing implicit `type Assoc: Sized;` bound Fix rust-lang#85378.

coverage: Simplify the injection of coverage statements This is a follow-up to rust-lang#116046 that I left out of that PR because I didn't want to make it any larger. After the various changes we've made to how coverage data is stored and transferred, the old code structure for injecting coverage statements into MIR is built around a lot of constraints that don't exist any more. We can simplify it by replacing it with a handful of loops over the BCB node/edge counters and the BCB spans. --- `@rustbot` label +A-code-coverage

Typo suggestion to change bindings with leading underscore When encountering a binding that isn't found but has a typo suggestion for a binding with a leading underscore, suggest changing the binding definition instead of the use place. Fix rust-lang#60164.

Add stable Instance::body() and RustcInternal trait The `Instance::body()` returns a monomorphized body. For that, we had to implement visitor that monomorphize types and constants. We are also introducing the RustcInternal trait that will allow us to convert back from Stable to Internal. Note that this trait is not yet visible for our users as it depends on Tables. We should probably add a new trait that can be exposed. The tests here are very simple, and I'm planning on creating more exhaustive tests in the project-mir repo. But I was hoping to get some feedback here first. r? ```@oli-obk```

…k,cjgillot coverage: Fix inconsistent handling of function signature spans While doing some more cleanup of `spans`, I noticed a strange inconsistency in how function signatures are handled. Normally the function signature span is treated as though it were executable as part of the start of the function, but in some cases the signature span disappears entirely from coverage, for no obvious reason. This is caused by the fact that spans created by `CoverageSpan::for_fn_sig` don't add the span to their `merged_spans` field (unlike normal statement/terminator spans). In cases where the span-processing code looks at those merged spans, it thinks the signature span is no longer visible and deletes it. Adding the signature span to `merged_spans` resolves the inconsistency. (Prior to rust-lang#116409 this wouldn't have been possible, because there was no case in the old `CoverageStatement` enum representing a signature. Now that `merged_spans` is just a list of spans, that's no longer an obstacle.)

Mention `into_iter` on borrow errors suggestions when appropriate If we encounter a borrow error on `vec![1, 2, 3].iter()`, suggest `into_iter`. Fix rust-lang#68445.

…rrors Point at assoc fn definition on type param divergence When the number of type parameters in the associated function of an impl and its trait differ, we now *always* point at the trait one, even if it comes from a foreign crate. When it is local, we point at the specific params, when it is foreign, we point at the whole associated item. Fix rust-lang#69944.

matthiaskrgr · 2023-10-21T08:08:34Z

@bors r+ rollup=never p=8

bors · 2023-10-21T08:08:36Z

📌 Commit e9d18f5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-21T09:09:08Z

⌛ Testing commit e9d18f5 with merge 6f97d83...

bors · 2023-10-21T11:03:13Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6f97d83 to master...

rust-timer · 2023-10-21T11:05:27Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#114521	std: freebsd build update.	`d59458d642a00ecabf2331569205429f0dead33a` (link)
#116911	Suggest relaxing implicit `type Assoc: Sized;` bound	`725778170b54ca88649b8e78937b3ce6ff7bcf53` (link)
#116917	coverage: Simplify the injection of coverage statements	`3811aa06687816c76e8edad297848e298f7ef933` (link)
#116961	Typo suggestion to change bindings with leading underscore	`c178ecfc8a3dfac49a5625bc655c2ec175719ee5` (link)
#116964	Add stable Instance::body() and RustcInternal trait	`7af1ead1779d70897af7ee61d9b69439733b52ea` (link)
#116974	coverage: Fix inconsistent handling of function signature s…	`37bb7716c13b8be389fb3da23632256791163e5a` (link)
#116990	Mention `into_iter` on borrow errors suggestions when appro…	`a4933de0157427c22d855190c93bd531d9404f6b` (link)
#116995	Point at assoc fn definition on type param divergence	`0496cc54918f1a9ee15223bcb2e3ecc1e8709827` (link)

previous master: 45a45c6e60

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-21T12:24:49Z

Finished benchmarking commit (6f97d83): 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)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-2.7%	[-2.7%, -2.7%]	1
All ❌✅ (primary)	-2.3%	[-2.3%, -2.3%]	1

Cycles

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

Binary size

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

Bootstrap: 630.052s -> 629.633s (-0.07%)
Artifact size: 304.01 MiB -> 304.07 MiB (0.02%)

estebank and others added 21 commits October 19, 2023 00:07

Suggest relaxing implicit type Assoc: Sized; bound

e8d4fb8

Fix rust-lang#85378.

std: freebsd build update.

9a963e8

since freebsd 11 had been removed, minimum is now 12.

Remove obsolete comment

6e643e1

Typo suggestion to change bindings with leading underscore

b0d17f3

When encountering a binding that isn't found but has a typo suggestion for a binding with a leading underscore, suggest changing the binding definition instead of the use place. Fix rust-lang#60164.

Mention into_iter on borrow errors suggestions when appropriate

88bccf4

If we encounter a borrow error on `vec![1, 2, 3].iter()`, suggest `into_iter`. Fix rust-lang#68445.

changes from feedback

f479142

coverage: Add a test showing the inconsistent handling of function si…

dca4295

…gnatures

coverage: Handle fn signature spans more consistently near ?

a17ff82

coverage: Don't create an intermediate vec for each BCB's initial spans

e164944

coverage: Simplify initial creation of coverage spans

319693a

coverage: Simplify the injection of coverage statements

ff02d92

Rollup merge of rust-lang#114521 - devnexen:std_fbsd_13_upd, r=cuviper

90671a0

std: freebsd build update. since freebsd 11 had been removed, minimum is now 12.

Rollup merge of rust-lang#116911 - estebank:issue-85378, r=oli-obk

3fd7175

Suggest relaxing implicit `type Assoc: Sized;` bound Fix rust-lang#85378.

Rollup merge of rust-lang#116990 - estebank:issue-68445, r=cjgillot

dd66bc8

Mention `into_iter` on borrow errors suggestions when appropriate If we encounter a borrow error on `vec![1, 2, 3].iter()`, suggest `into_iter`. Fix rust-lang#68445.

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

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

bors merged commit 6f97d83 into rust-lang:master Oct 21, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 21, 2023

This was referenced Oct 21, 2023

Avoid having rustc_smir depend on rustc_interface or rustc_driver #116837

Merged

Add method to convert internal to stable constructs #117010

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #117013

Rollup of 8 pull requests #117013

matthiaskrgr commented Oct 21, 2023

matthiaskrgr commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

rust-timer commented Oct 21, 2023

rust-timer commented Oct 21, 2023

Rollup of 8 pull requests #117013

Rollup of 8 pull requests #117013

Conversation

matthiaskrgr commented Oct 21, 2023

matthiaskrgr commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

rust-timer commented Oct 21, 2023

rust-timer commented Oct 21, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size