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

ungate try_from because it has been stabilized #2010

Merged
merged 16 commits into from
Apr 16, 2019
Merged

ungate try_from because it has been stabilized #2010

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b0e0453
ungate try_from because it has been stabilized
KeenS Mar 13, 2019
5966e3e
update rustc version that is used in compiletests
KeenS Mar 13, 2019
47e74f3
update version in rust-toolchain too
KeenS Mar 13, 2019
0db7c6b
remove comment
KeenS Mar 14, 2019
b6cecbd
update config of travis ci too
KeenS Mar 14, 2019
0b96ab4
update FIXME comment
KeenS Mar 15, 2019
59f110e
Merge branch 'master' of git://github.com/diesel-rs/diesel into try_from
KeenS Apr 2, 2019
9641aef
update some ui tests
KeenS Apr 2, 2019
0892d84
remove redundant imports
KeenS Apr 2, 2019
d2dafbb
remove more
KeenS Apr 2, 2019
6cc7c2c
Bump minimal supported version to 1.34
weiznich Apr 14, 2019
1cc4a03
More fixes
weiznich Apr 14, 2019
82974ee
Fix diesel_cli tests
weiznich Apr 15, 2019
1438a71
Address review comments
weiznich Apr 15, 2019
1825bcd
Cleanup from_sql implementation of BigDecimal
weiznich Apr 15, 2019
e4bdb2e
Workaround clippy false positive
weiznich Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ matrix:
allow_failures:
- rust: nightly
include:
- rust: nightly-2018-11-27
- rust: nightly-2019-02-26
name: "Compile tests"
script:
- (cd diesel_compile_tests && cargo +$TRAVIS_RUST_VERSION test)
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
- template: _build/install-rust.yml
parameters:
platform: Linux
rust_version: nightly-2018-11-27
rust_version: nightly-2019-02-26
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated nightly version to pass test. Is this acceptable? To say more, what's the policy of supported nightly version?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that's fine. This is only the compile tests. We don't officially support nightly, we just bump this periodically as needed to be able to run the compile tests (which require nightly)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see.

- bash: |
sudo apt-get update &&
sudo apt-get -y install libsqlite3-dev libpq-dev libmysqlclient-dev
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
//! You can come ask for help at
//! [gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel)

#![cfg_attr(feature = "unstable", feature(specialization, try_from))]
#![cfg_attr(feature = "unstable", feature(specialization))]
Copy link
Member

Choose a reason for hiding this comment

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

We should remove the gating on the uses of this feature as well (grep try_from)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

try_from has been stabilized (ungated) at nightly but it is still nightly only API.

Copy link
Member

Choose a reason for hiding this comment

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

Ah I see

Copy link
Member

Choose a reason for hiding this comment

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

Can you update the FIXME comment to specify which Rust version we can use it?

// Built-in Lints
#![deny(
warnings,
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/pg/types/numeric.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ mod bigdecimal {

impl FromSql<Numeric, Pg> for BigDecimal {
fn from_sql(numeric: Option<&[u8]>) -> deserialize::Result<Self> {
// FIXME: Use the TryFrom impl when try_from is stable
// FIXME: Use the TryFrom impl after Rust 1.34 get released.
weiznich marked this conversation as resolved.
Show resolved Hide resolved
let numeric = PgNumeric::from_sql(numeric)?;
pg_decimal_to_bigdecimal(&numeric)
}
Expand Down
2 changes: 1 addition & 1 deletion diesel_compile_tests/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2018-11-27
nightly-2019-02-26
Copy link
Member

Choose a reason for hiding this comment

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

That changes the output of our compile tests, which means you need to go though that errors and adjust them. (There is a script for that)