Skip to content
New issue

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

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

Already on GitHub? # to your account

Remove redundant code from copy-suggestions #94698

Merged
merged 1 commit into from
Mar 18, 2022

Conversation

WaffleLapkin
Copy link
Member

Follow up to #94375, just remove some code that is not necessary anymore. This may make the perf of such suggestions a little bit worse, but I don't think this is significant.

r? @estebank

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 7, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2022
@bors
Copy link
Collaborator

bors commented Mar 7, 2022

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

@Dylan-DPC
Copy link
Member

well let's try it

@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 Mar 7, 2022
@compiler-errors
Copy link
Member

Wouldn't this only be a perf regression on failure paths? So I don't think rust-timer would reveal anything other than noise.

@WaffleLapkin WaffleLapkin force-pushed the simplify-copy-suggestions branch from 7bc0b52 to 74d0866 Compare March 7, 2022 19:27
@estebank
Copy link
Contributor

r=me after rebasing

@WaffleLapkin
Copy link
Member Author

Why rebase is required? I've already rebased to fix the conflict 4 days ago...

P.S. it seems like the rust-timer didn't run, because the queue got flushed

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 17, 2022

📌 Commit 74d0866 has been approved by estebank

@bors
Copy link
Collaborator

bors commented Mar 17, 2022

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Mar 17, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2022
Rollup of 10 pull requests

Successful merges:

 - rust-lang#91133 (Improve `unsafe` diagnostic)
 - rust-lang#93222 (Make ErrorReported impossible to construct outside `rustc_errors`)
 - rust-lang#93745 (Stabilize ADX target feature)
 - rust-lang#94309 ([generator_interior] Be more precise with scopes of borrowed places)
 - rust-lang#94698 (Remove redundant code from copy-suggestions)
 - rust-lang#94731 (Suggest adding `{ .. }` around a const function call with arguments)
 - rust-lang#94960 (Fix many spelling mistakes)
 - rust-lang#94982 (Add deprecated_safe feature gate and attribute, cc rust-lang#94978)
 - rust-lang#94997 (debuginfo: Fix ICE when generating name for type that produces a layout error.)
 - rust-lang#95000 (Fixed wrong type name in comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a8956e6 into rust-lang:master Mar 18, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 18, 2022
@WaffleLapkin WaffleLapkin deleted the simplify-copy-suggestions branch November 22, 2022 17:27
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-perf Status: Waiting on a perf run to be completed. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants