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

Merge new_without_default_derive into new_without_default #3558

Merged
merged 1 commit into from
Dec 29, 2018
Merged

Merge new_without_default_derive into new_without_default #3558

merged 1 commit into from
Dec 29, 2018

Conversation

russelltg
Copy link
Contributor

Closes #3525, deprecating new_without_default_derive and moving both lints into new_without_default.

@russelltg
Copy link
Contributor Author

What is the correct way to remove lints like this? I figured it should have an associated register_removed, but when i called ./util/dev update_lints it removed the one I had added...

@flip1995 flip1995 mentioned this pull request Dec 18, 2018
Merged
@flip1995 flip1995 added the S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) label Dec 19, 2018
@flip1995
Copy link
Member

ping from triage @russelltg. Could you address the review comment? The renaming function is already on master since #3554

@bors
Copy link
Contributor

bors commented Dec 27, 2018

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

@russelltg
Copy link
Contributor Author

The failures do not seem related to my changes, is there anything that I'm missing?

@flip1995
Copy link
Member

Fixed in #3591

@phansch phansch closed this Dec 28, 2018
@phansch phansch reopened this Dec 28, 2018
@bors
Copy link
Contributor

bors commented Dec 28, 2018

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

@phansch
Copy link
Member

phansch commented Dec 28, 2018

Regarding the merge conflict in tests/ui/methods.stderr: It should be resolvable if you only keep the parts where the line numbers are represented by an LL. Alternatively you could also run update_all_references.sh and keep those changes.

Apart from that, there's some outstanding rustfmt issues:

selection_048

@russelltg
Copy link
Contributor Author

So what's next? I don't think I can change the tags to be waiting on review

@flip1995
Copy link
Member

It's done! We just need a ping sometimes 😉

@bors r+ Thanks!

@bors
Copy link
Contributor

bors commented Dec 29, 2018

📌 Commit d127aed has been approved by flip1995

@bors
Copy link
Contributor

bors commented Dec 29, 2018

⌛ Testing commit d127aed with merge 6cba3da...

bors added a commit that referenced this pull request Dec 29, 2018
@bors
Auto merge of #3558 - russelltg:new_without_default_merge, r=flip1995
6cba3da 
Merge new_without_default_derive into new_without_default

Closes #3525, deprecating new_without_default_derive and moving both lints into new_without_default.
@bors
Copy link
Contributor

bors commented Dec 29, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: flip1995
Pushing 6cba3da to master...

@bors bors merged commit d127aed into rust-lang:master Dec 29, 2018
@bors bors mentioned this pull request Dec 29, 2018
Merged
@flip1995 flip1995 mentioned this pull request Jan 7, 2019
Closed
@flip1995 flip1995 mentioned this pull request Jan 29, 2019
Open
@rail-rain rail-rain mentioned this pull request Dec 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flip1995 flip1995 flip1995 left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees
No one assigned
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@russelltg @flip1995 @bors @phansch @oli-obk