Skip to content

Commit b0fbced

Browse files
committed
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 #222 (comment) of issue #222. Also added a travis line, in response to #222 (comment). Hope it works.
2 parents ccdf307 + eb486e8 commit b0fbced

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis/test_nightly.sh

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ set -ex
55
cargo bench --verbose
66

77
cargo test --verbose --manifest-path=macros/Cargo.toml
8+
9+
# Build test for the serde feature
10+
cargo build --verbose --features "serde"

rational/src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ use std::hash;
2828
use std::ops::{Add, Div, Mul, Neg, Rem, Sub};
2929
use std::str::FromStr;
3030

31-
#[cfg(feature = "serde")]
32-
use serde;
33-
3431
#[cfg(feature = "num-bigint")]
3532
use bigint::{BigInt, BigUint, Sign};
3633

@@ -604,7 +601,7 @@ impl<T> serde::Deserialize for Ratio<T>
604601
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
605602
where D: serde::Deserializer
606603
{
607-
let (numer, denom) = try!(serde::Deserialize::deserialize(deserializer));
604+
let (numer, denom): (T,T) = try!(serde::Deserialize::deserialize(deserializer));
608605
if denom.is_zero() {
609606
Err(serde::de::Error::invalid_value("denominator is zero"))
610607
} else {

0 commit comments

Comments
 (0)