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

Some rustups #5040

Merged
merged 8 commits into from
Jan 11, 2020
Merged

Some rustups #5040

merged 8 commits into from
Jan 11, 2020

Conversation

JohnTitor
Copy link
Member

changelog: none

Centril
Centril reviewed Jan 11, 2020
View reviewed changes
clippy_lints/src/utils/author.rs Outdated Show resolved Hide resolved
clippy_lints/src/matches.rs Outdated Show resolved Hide resolved
clippy_lints/src/utils/hir_utils.rs Outdated Show resolved Hide resolved
@JohnTitor
Copy link
Member Author

@Centril Added commit 10cf141, could you review it?

@JohnTitor
Copy link
Member Author

JohnTitor commented Jan 11, 2020 •
edited
Loading

I've noticed we need more rustup, I'm preparing now (it needs large import pass changes...)

@JohnTitor JohnTitor changed the title Rustup to rust-lang/rust#67258 and rust-lang/rust#68101 Some rustups Jan 11, 2020
@JohnTitor
Copy link
Member Author

Uhm, fmt doesn't know half-open ranges?

@flip1995
Copy link
Member

Can you try to add a #[rustfmt::skip] to the test (with a FIXME)?

@flip1995 flip1995 mentioned this pull request Jan 11, 2020
Merged
6 tasks
@JohnTitor
Copy link
Member Author

Can you try to add a #[rustfmt::skip] to the test (with a FIXME)?

Uhm, rustfmt still says it's unsupported on my local, should I push here?

@flip1995
Copy link
Member

Hm, then I think the only thing we can do is to comment out the test and open an issue in rustfmt.

@flip1995
Copy link
Member

@bors delegate+ p=10

r=me once Travis passes. I have to go now, and won't have access to a PC until tomorrow evening.

@bors
Copy link
Collaborator

bors commented Jan 11, 2020

✌️ @JohnTitor can now approve this pull request

@JohnTitor
Copy link
Member Author

Ugh, just needs more rustup, okay, I'll fix soon...

@JohnTitor
Copy link
Member Author

Okay, latest rustup is added, I'll r=flip1995 once CI is green.

@JohnTitor
Copy link
Member Author

@bors r=flip1995

@bors
Copy link
Collaborator

bors commented Jan 11, 2020

📌 Commit 8a3a0ea has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Jan 11, 2020

⌛ Testing commit 8a3a0ea with merge 9a669c4...

bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of #5040 - JohnTitor:rustup-0111, r=flip1995
9a669c4 
Some rustups

changelog: none
@bors
Copy link
Collaborator

bors commented Jan 11, 2020

💔 Test failed - checks-travis

@JohnTitor
Copy link
Member Author

Removed references, let's try again.
@bors r=flip1995

@bors
Copy link
Collaborator

bors commented Jan 11, 2020

📌 Commit 2f4b105 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Jan 11, 2020

⌛ Testing commit 2f4b105 with merge 2677a4e...

bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of #5040 - JohnTitor:rustup-0111, r=flip1995
2677a4e 
Some rustups

changelog: none
@krishna-veerareddy krishna-veerareddy mentioned this pull request Jan 11, 2020
Merged
@bors
Copy link
Collaborator

bors commented Jan 11, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing 2677a4e to master...

@bors bors merged commit 2f4b105 into rust-lang:master Jan 11, 2020
@JohnTitor JohnTitor deleted the rustup-0111 branch January 11, 2020 21:02
This was referenced Jan 11, 2020
Closed
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JohnTitor @flip1995 @bors @Centril