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

Bump minimal version to 1.31 #1936

Merged
merged 6 commits into from
Jan 4, 2019
Merged

Bump minimal version to 1.31 #1936

merged 6 commits into from
Jan 4, 2019

Conversation

weiznich
Copy link
Member

(Sorry for opening the next formatting PR again, hopefully this is the last one…)

@weiznich weiznich requested a review from a team December 12, 2018 22:37
@weiznich weiznich mentioned this pull request Dec 13, 2018
Closed
@h-michael
Copy link
Contributor

h-michael commented Dec 16, 2018 •
edited
Loading

@weiznich
First of all, thank you for maintaining this project.

Are you going to merge this PR in a few days?
There are too many PR which is in review and wait for being reviewed for a log time.
If you merge this PR with leaving those PR, almost all those PR face conflict.
I think that you and @diesel-rs/reviewers review and merge those PR before merging this PR.

@VictorKoenders VictorKoenders mentioned this pull request Dec 17, 2018
Merged
@weiznich
Copy link
Member Author

@h-michael The problem is that the CI is currently broken because a dependency bumped it minimal supported rust version. This requires us to also bump our minimal supported version, which is done in this PR. Generally we have the policy to not merge any PR's where the CI is broken.
That said I totally understand your frustration to rebase your PR again, but I see no easy solution for this...

Also this should be the last rustfmt related change for a longer time 🎉

@h-michael
Copy link
Contributor

@weiznich
I understand your thought.
Thank you for explaining me!
I'll rebase later.

@weiznich weiznich merged commit 77afd4d into diesel-rs:master Jan 4, 2019
mehcode added a commit to mehcode/diesel that referenced this pull request Jan 15, 2019
@mehcode
Replace try! with ? in more places
8cc02b5 
It seems diesel-rs#1936 removed most uses of try! with rustfmt but rustfmt can't see inside macro usage or doc comments (both of which will trigger errors under rust 2018).
@mehcode mehcode mentioned this pull request Jan 15, 2019
Merged
disconsented pushed a commit to NarrativeApp/diesel that referenced this pull request Nov 26, 2020
@mehcode
Replace try! with ? in more places
9603e4f 
It seems diesel-rs#1936 removed most uses of try! with rustfmt but rustfmt can't see inside macro usage or doc comments (both of which will trigger errors under rust 2018).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgrif sgrif sgrif approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@weiznich @h-michael @sgrif