xeos
/
num-traits
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #223 - SuperFluffy:fix_import_serde, r=cuviper 

Fix import serde and rational deserialization

Similar to #196 for num/complex, “use serde;” needed to be removed in num/rational.

Also, deserialization of `num/rational` needed to be fixed by adding type annotations.

This is in response to https://github.com/rust-num/num/pull/222#issuecomment-239957062 of issue https://github.com/rust-num/num/pull/222.

Also added a travis line, in response to https://github.com/rust-num/num/pull/222#issuecomment-239957062. Hope it works.
This commit is contained in:
Homu 2016-08-18 03:59:26 +09:00
parent ccdf307cee eb486e8dc1
commit b0fbcedfa0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis/test_nightly.sh
View File

@ -5,3 +5,6 @@ set -ex
cargo bench --verbose
cargo test --verbose --manifest-path=macros/Cargo.toml
# Build test for the serde feature
cargo build --verbose --features "serde"

5
rational/src/lib.rs
View File

@ -28,9 +28,6 @@ use std::hash;
use std::ops::{Add, Div, Mul, Neg, Rem, Sub};
use std::str::FromStr;
#[cfg(feature = "serde")]
use serde;
#[cfg(feature = "num-bigint")]
use bigint::{BigInt, BigUint, Sign};
@ -604,7 +601,7 @@ impl<T> serde::Deserialize for Ratio<T>
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
where D: serde::Deserializer
{
let (numer, denom) = try!(serde::Deserialize::deserialize(deserializer));
let (numer, denom): (T,T) = try!(serde::Deserialize::deserialize(deserializer));
if denom.is_zero() {
Err(serde::de::Error::invalid_value("denominator is zero"))
} else {