Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove function parameters only used in recursion #96027

Merged
merged 3 commits into from
Apr 15, 2022
Merged

remove function parameters only used in recursion #96027

merged 3 commits into from
Apr 15, 2022

Conversation

matthiaskrgr
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @fee1-dead

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

@rustbot 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 rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 13, 2022
@matthiaskrgr
Copy link
Member Author

out of curiosity
@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

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

bors commented Apr 13, 2022

⌛ Trying commit 6547eaca3c4bf97815975ff023e65efcd659349f with merge d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec...

@bors
Copy link
Contributor

bors commented Apr 13, 2022

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

@rust-timer
Copy link
Collaborator

Queued d4095f9ba6b8cdf8a7f31aee0a509015b91e92ec with parent dc4bfcb, future comparison URL.

@rust-timer
Copy link
Collaborator

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)
count1 0 0 1 0 1
mean2 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

Footnotes

  1. number of relevant changes ↩

  2. the arithmetic mean of the percent change ↩

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 14, 2022
fee1-dead
fee1-dead approved these changes Apr 14, 2022
View reviewed changes
Copy link
Member

@fee1-dead fee1-dead left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks

@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2022

📌 Commit 6547eaca3c4bf97815975ff023e65efcd659349f has been approved by fee1-dead

@bors 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
Copy link
Contributor

bors commented Apr 14, 2022

🔒 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:

  1. git checkout clippy_rec (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. 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 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
@bors
Copy link
Contributor

bors commented Apr 14, 2022

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

@matthiaskrgr
Copy link
Member Author

rebased
@bors r=fee1-dead

@bors
Copy link
Contributor

bors commented Apr 14, 2022

📌 Commit 6511976 has been approved by fee1-dead

@bors 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
@fee1-dead
Copy link
Member

@bors rollup=maybe

@Dylan-DPC Dylan-DPC mentioned this pull request Apr 15, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 15, 2022
@bors
Auto merge of rust-lang#96087 - Dylan-DPC:rollup-k6yzk55, r=Dylan-DPC
3f391b8 
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
@bors bors merged commit 937b0a0 into rust-lang:master Apr 15, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fee1-dead fee1-dead fee1-dead approved these changes

Assignees

@fee1-dead fee1-dead

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.
6 participants
@matthiaskrgr @rust-highfive @rust-timer @bors @fee1-dead @rustbot