remove function parameters only used in recursion by matthiaskrgr · Pull Request #96027 · rust-lang/rust

matthiaskrgr · 2022-04-13T21:13:08Z

No description provided.

rust-highfive · 2022-04-13T21:13:11Z

r? @fee1-dead

(rust-highfive has picked a reviewer for you, use r? to override)

matthiaskrgr · 2022-04-13T21:44:57Z

out of curiosity
@bors try @rust-timer queue

rust-timer · 2022-04-13T21:44:59Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-04-13T21:45:08Z

⌛ Trying commit 6547eaca3c4bf97815975ff023e65efcd659349f with merge d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec...

bors · 2022-04-13T23:35:27Z

☀️ Try build successful - checks-actions
Build commit: d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec (d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec)

rust-timer · 2022-04-13T23:35:28Z

Queued d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec with parent dc4bfcb, future comparison URL.

rust-timer · 2022-04-14T08:08:03Z

Finished benchmarking commit (d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec): comparison url.

Summary:

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: no relevant changes found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	1	0	1
mean²	N/A	N/A	-1.0%	N/A	-1.0%
max	N/A	N/A	-1.0%	N/A	-1.0%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

number of relevant changes↩
the arithmetic mean of the percent change↩

fee1-dead

LGTM! Thanks

fee1-dead · 2022-04-14T08:09:25Z

@bors r+

bors · 2022-04-14T08:09:26Z

📌 Commit 6547eaca3c4bf97815975ff023e65efcd659349f has been approved by fee1-dead

bors · 2022-04-14T09:34:27Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout clippy_rec(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self clippy_rec --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_expand/src/mbe/macro_rules.rs
CONFLICT (content): Merge conflict in compiler/rustc_expand/src/mbe/macro_rules.rs
Auto-merging compiler/rustc_expand/src/mbe/macro_parser.rs
CONFLICT (content): Merge conflict in compiler/rustc_expand/src/mbe/macro_parser.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2022-04-14T09:45:40Z

☔ The latest upstream changes (presumably #95928) made this pull request unmergeable. Please resolve the merge conflicts.

matthiaskrgr · 2022-04-14T09:59:12Z

rebased
@bors r=fee1-dead

bors · 2022-04-14T09:59:13Z

📌 Commit 6511976 has been approved by fee1-dead

fee1-dead · 2022-04-15T07:03:52Z

@bors rollup=maybe

Rollup of 11 pull requests Successful merges: - rust-lang#94457 (Stabilize `derive_default_enum`) - rust-lang#94461 (Create (unstable) 2024 edition) - rust-lang#94849 (Check var scope if it exist) - rust-lang#95194 (remove find_use_placement) - rust-lang#95749 (only downgrade selection Error -> Ambiguous if type error is in predicate) - rust-lang#96026 (couple of clippy::complexity fixes) - rust-lang#96027 (remove function parameters only used in recursion) - rust-lang#96034 ([test] Add test cases of untested functions for BTreeSet ) - rust-lang#96040 (Use u32 instead of i32 for futexes.) - rust-lang#96062 (docs: Update tests chapter for Termination stabilization) - rust-lang#96065 (Refactor: Use `format-args-capture` and remove unnecessary nested blocks in rustc_typeck) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned fee1-dead Apr 13, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 13, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 13, 2022

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 13, 2022

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 14, 2022

fee1-dead approved these changes Apr 14, 2022
View reviewed changes

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 Apr 14, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 14, 2022

matthiaskrgr added 3 commits April 14, 2022 11:54

remove function param that is only used in recursive of fn inner()
75287dd

remove reudndant function param in check_matcher_core()
15abc81

remove redundant function param in check_for_self_assign_helper()
6511976

matthiaskrgr force-pushed the clippy_rec branch from 6547eac to 6511976Compare April 14, 2022 09:57

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2022

Dylan-DPC mentioned this pull request Apr 15, 2022
Rollup of 11 pull requests #96087
Merged

bors merged commit 937b0a0 into rust-lang:masterApr 15, 2022

rustbot added this to the 1.62.0 milestone Apr 15, 2022

matthiaskrgr deleted the clippy_rec branch January 25, 2025 09:12

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Apr 13, 2022

Uh oh!

rust-highfive commented Apr 13, 2022

Uh oh!

matthiaskrgr commented Apr 13, 2022

Uh oh!

rust-timer commented Apr 13, 2022

Uh oh!

bors commented Apr 13, 2022

Uh oh!

bors commented Apr 13, 2022

Uh oh!

rust-timer commented Apr 13, 2022

Uh oh!

rust-timer commented Apr 14, 2022

Footnotes

Uh oh!

fee1-dead left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fee1-dead commented Apr 14, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

matthiaskrgr commented Apr 14, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

fee1-dead commented Apr 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fee1-dead left a comment •
edited
Loading