Rollup of 7 pull requests #116804

matthiaskrgr · 2023-10-16T17:10:52Z

Successful merges:

Enable triagebot no-merges check #114157 (Enable triagebot no-merges check)
Suggest trait bounds for used associated type on type param #116257 (Suggest trait bounds for used associated type on type param)
vendoring in tarball sources #116430 (vendoring in tarball sources)
Update minifier version to 0.2.3 #116709 (Update minifier version to 0.2.3)
Update my mailmap entry #116786 (Update my mailmap entry)
opt-dist: disable unused features for tabled crate #116790 (opt-dist: disable unused features for tabled crate)
Remove DefiningAnchor::Bubble from opaque wf check #116802 (Remove DefiningAnchor::Bubble from opaque wf check)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: onur-ozkan <work@onurozkan.dev>

We don't need to run `fn update_submodule` on rust-analyzer as it's no longer a submodule. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Fix rust-lang#101351. When an associated type on a type parameter is used, and the type parameter isn't constrained by the correct trait, suggest the appropriate trait bound: ``` error[E0220]: associated type `Associated` not found for `T` --> file.rs:6:15 | 6 | field: T::Associated, | ^^^^^^^^^^ there is a similarly named associated type `Associated` in the trait `Foo` | help: consider restricting type parameter `T` | 5 | struct Generic<T: Foo> { | +++++ ``` When an associated type on a type parameter has a typo, suggest fixing it: ``` error[E0220]: associated type `Baa` not found for `T` --> $DIR/issue-55673.rs:9:8 | LL | T::Baa: std::fmt::Debug, | ^^^ there is a similarly named associated type `Bar` in the trait `Foo` | help: change the associated type name to use `Bar` from `Foo` | LL | T::Bar: std::fmt::Debug, | ~~~ ```

This configuration will exclude rollup PRs and subtree sync PRs from merge commit detection. On other PRs, it will post the default warning message and add the `has-merge-commits` and `S-waiting-on-author` labels when merge commits are detected. The eventual vision is to have bors refuse to merge if the `has-merge-commits` label is present. A reviewer can still force the merge by removing that label if they so wish.

Enable triagebot no-merges check Follow-up on rust-lang/triagebot#1704 ### Motivation Occasionally, a merge commit like rust-lang@cb5c011 makes it past manual review and gets merged into master. At one point, we tried adding a check to CI to prevent this from happening (rust-lang#105058), but that ended up [problematic](rust-lang#106319 (comment)) and was [reverted](rust-lang#106320). This kind of check is simply too fragile for CI, and there must be a way for a human to override the bot's decision. The capability to detect and warn about merge commits has been present in triagebot for quite some time, but was never enabled at rust-lang/rust, possibly due to concerns about false positives on rollup and subtree sync PRs. This PR intends to alleviate those concerns. ### Configuration This configuration will exclude rollup PRs and subtree sync PRs from merge commit detection, and it will post the default warning message and add the `has-merge-commits` and `S-waiting-on-author` labels when merge commits are detected on other PRs. The eventual vision is to have bors refuse to merge if the `has-merge-commits` label is present. A reviewer can still force the merge by removing that label if they so wish. ### Note for contributors The rollup tool should add that label automatically, but anyone performing subtree updates should begin including "subtree update" in the titles of those PRs, to avoid false positives. r? infra ## Open Questions 1. This configuration uses the default message that's built into triagebot: > There are merge commits (commits with multiple parents) in your changes. We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) so these commits will need to be removed for this pull request to be merged. > > You can start a rebase with the following commands: > ```shell-session > $ # rebase > $ git rebase -i master > $ # delete any merge commits in the editor that appears > $ git push --force-with-lease > ``` Any changes to this are easy, I'll just have to add a `message` option. Should we mention the excluded titles in the message?

Suggest trait bounds for used associated type on type param Fix rust-lang#101351. When an associated type on a type parameter is used, and the type parameter isn't constrained by the correct trait, suggest the appropriate trait bound: ``` error[E0220]: associated type `Associated` not found for `T` --> file.rs:6:15 | 6 | field: T::Associated, | ^^^^^^^^^^ there is a similarly named associated type `Associated` in the trait `Foo` | help: consider restricting type parameter `T` | 5 | struct Generic<T: Foo> { | +++++ ``` When an associated type on a type parameter has a typo, suggest fixing it: ``` error[E0220]: associated type `Baa` not found for `T` --> $DIR/issue-55673.rs:9:8 | LL | T::Baa: std::fmt::Debug, | ^^^ there is a similarly named associated type `Bar` in the trait `Foo` | help: change the associated type name to use `Bar` from `Foo` | LL | T::Bar: std::fmt::Debug, | ~~~ ```

…urces, r=clubby789 vendoring in tarball sources fixes rust-lang#94782

…notriddle Update minifier version to 0.2.3 Thanks for the fix `@notriddle` ! r? `@notriddle`

Update my mailmap entry

…r=Kobzol opt-dist: disable unused features for tabled crate Features looks unused, so left only used ones. r? `@Kobzol`

…r=oli-obk Remove `DefiningAnchor::Bubble` from opaque wf check Set the defining anchor to `DefiningAnchor::Bind(parent_def_id)` where `parent_def_id` is the first parent def-id that isn't an opaque. This "fixes" some of the nested-return-type wf tests. If we *do* want these to be hard-errors for TAITs, we should probably make those error separately from this check (i.e. via some check like the code in the `OPAQUE_HIDDEN_INFERRED_BOUND` lint). The fact that some of these tests fail but not all of them seems kinda coincidental. r? oli-obk

matthiaskrgr · 2023-10-16T17:11:05Z

@bors r+ rollup=never p=7

bors · 2023-10-16T17:11:07Z

📌 Commit b0572f1 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-16T18:57:47Z

⌛ Testing commit b0572f1 with merge a76ec18...

bors · 2023-10-16T21:05:06Z

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

rust-timer · 2023-10-16T21:07:07Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#114157	Enable triagebot no-merges check	`bdf107855738c0937180eb50fa98a4e151e6a3bb` (link)
#116257	Suggest trait bounds for used associated type on type param	`dc500e2f1ef0e0e8fe5de297205798301d3754aa` (link)
#116430	vendoring in tarball sources	`8d568d0ff2c6e2383c7cb138cb17408707d2e618` (link)
#116709	Update minifier version to 0.2.3	`2da5b07e47f76bb0b092b382ea4d83c92dc45ba1` (link)
#116786	Update my mailmap entry	`187615a6501ab24375b7f9a64519fa736266e6eb` (link)
#116790	opt-dist: disable unused features for tabled crate	`fda44d36f2c532d087bb5c5b0d4a9d269696605c` (link)
#116802	Remove `DefiningAnchor::Bubble` from opaque wf check	`7ae1c06543f2ddd33400bd1289af87298f7e99bc` (link)

previous master: 4af886f8ab

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-16T23:12:45Z

Finished benchmarking commit (a76ec18): 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)

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

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

Binary size

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

Bootstrap: 627.067s -> 626.726s (-0.05%)
Artifact size: 305.59 MiB -> 305.62 MiB (0.01%)

onur-ozkan and others added 16 commits October 4, 2023 22:42

vendor distribution on the tarball sources

6d7e6a2

Signed-off-by: onur-ozkan <work@onurozkan.dev>

remove the use of fn update_submodule on rust-analyzer

92ab93f

We don't need to run `fn update_submodule` on rust-analyzer as it's no longer a submodule. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Update my mailmap entry

58a3c9d

Tweak wording

20c622e

Update minifier version to 0.2.3

87ae477

opt-dist: disable unused features for tabled crate

8342596

Remove DefiningAnchor::Bubble from opaque wf check

743e6d1

Rollup merge of rust-lang#116430 - onur-ozkan:vendoring-in-tarball-so…

6f9df29

…urces, r=clubby789 vendoring in tarball sources fixes rust-lang#94782

Rollup merge of rust-lang#116709 - GuillaumeGomez:update-minifier, r=…

96be07e

…notriddle Update minifier version to 0.2.3 Thanks for the fix `@notriddle` ! r? `@notriddle`

Rollup merge of rust-lang#116786 - Urgau:mailmap-update, r=Nilstrieb

cacde67

Update my mailmap entry

Rollup merge of rust-lang#116790 - klensy:opt-dist-tabled-no-derive, …

98ea131

…r=Kobzol opt-dist: disable unused features for tabled crate Features looks unused, so left only used ones. r? `@Kobzol`

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

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

bors merged commit a76ec18 into rust-lang:master Oct 16, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 16, 2023

This was referenced Oct 16, 2023

reorganize/refactor bootstrap codebase #116196

Merged

Properly account for self ty in method disambiguation suggestion #116713

Merged

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #116804

Rollup of 7 pull requests #116804

matthiaskrgr commented Oct 16, 2023

matthiaskrgr commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

rust-timer commented Oct 16, 2023

rust-timer commented Oct 16, 2023

Rollup of 7 pull requests #116804

Rollup of 7 pull requests #116804

Conversation

matthiaskrgr commented Oct 16, 2023

matthiaskrgr commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

rust-timer commented Oct 16, 2023

rust-timer commented Oct 16, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size