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.

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

Upgrade diesel from 0.16 -> 1.x #229

Merged
merged 3 commits into from
Sep 20, 2018
Merged

Conversation

erikjohnston
Copy link
Contributor

@erikjohnston erikjohnston commented Aug 10, 2018

See diesel changelog for details about the API changes.

Admittedly this is mainly motivated because I was getting confused at the old on_conflict syntax compared with newer versions of diesel.

(I also had to add #![feature(never_type)] to make rfcbot compile at all).

(I cheekily ran cargo update as well, which I had forgotten about).

@erikjohnston
Copy link
Contributor Author

Looks like the test failures is due to failing to cargo install cargo-update, which I don't think is my fault?

@anp anp self-requested a review August 11, 2018 04:44
@anp
Copy link
Member

anp commented Aug 11, 2018

Hi, thanks so much!

Sorry about broken CI, I believe the issue here is being caused by a couple of issues that should be resolved in #232. Once that passes and lands you should be able to rebase onto master and get CI happy again.

@Centril
Copy link
Contributor

Centril commented Aug 11, 2018

#232 is now merged :)

Copy link
Member

@anp anp left a comment

Choose a reason for hiding this comment

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

Awesome! One question about the version changes.

Cargo.toml Outdated
r2d2 = "0.7.1"
r2d2-diesel = "0.16"
r2d2 = "0.8.2"
r2d2-diesel = "1.0.0"
Copy link
Member

Choose a reason for hiding this comment

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

Reading the changelog you linked (super helpful), looks like you may want to double check this: https://github.com/diesel-rs/diesel/blob/master/CHANGELOG.md#added-4

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Woops, that completely passed me by. Good catch!

@erikjohnston
Copy link
Contributor Author

I've rebased and replaced r2d2, and yay! The tests pass! Thank you both.

I forgot to mention that currently the diesel macros are causing a load of warnings during compilation, due to diesel-rs/diesel#1785. The fix has already landed, but hasn't been released yet. We can suppress these warnings for now by adding #![allow(proc_macro_derive_resolution_fallback)], but I'm not sure if we'd want to keep the warnings on to remind us that things will break if we forget to upgrade diesel again. What do people think?

@anp
Copy link
Member

anp commented Aug 13, 2018

@Centril do you have a strong opinion about how to handle the warnings from diesel?

@erikjohnston
Copy link
Contributor Author

@Centril do you have a strong opinion about how to handle the warnings from diesel?

I'm guessing by the tumbleweed it might be a no? 😇

@Centril
Copy link
Contributor

Centril commented Sep 20, 2018

I have no opinions at all :)

@anp please merge this if you are satisfied with it =P

@anp anp merged commit 13d87d5 into rust-lang:master Sep 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants