Skip to content

Commit

Permalink
cargo fmt --all
Browse files Browse the repository at this point in the history
Signed-off-by: Mohammad AlSaleh <[email protected]>
  • Loading branch information
MoSal committed Nov 24, 2019
1 parent d76a5a0 commit 7d7fcc4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/value/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl<'de> de::Deserialize<'de> for Value {
where
E: de::Error,
{
if v > 2i128.pow(64)-1 || v < -(2i128.pow(64)) {
if v > 2i128.pow(64) - 1 || v < -(2i128.pow(64)) {
return Err(E::custom("Integer value must be between -2^64 and 2^64-1"));
}

Expand Down
12 changes: 8 additions & 4 deletions src/value/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,12 @@ impl Ord for Value {
// Use i128 to avoid possible panic if abs() is called on -2^63
(SignedInteger(a), SignedInteger(b)) => i128::from(*a).abs().cmp(&i128::from(*b).abs()),
(LargeSignedInteger(a), LargeSignedInteger(b)) => a.abs().cmp(&b.abs()),
(UnsignedInteger(a), SignedInteger(b)) => i128::from(*a).abs().cmp(&i128::from(*b).abs()),
(SignedInteger(a), UnsignedInteger(b)) => i128::from(*a).abs().cmp(&i128::from(*b).abs()),
(UnsignedInteger(a), SignedInteger(b)) => {
i128::from(*a).abs().cmp(&i128::from(*b).abs())
}
(SignedInteger(a), UnsignedInteger(b)) => {
i128::from(*a).abs().cmp(&i128::from(*b).abs())
}
(LargeSignedInteger(a), UnsignedInteger(b)) => a.abs().cmp(&i128::from(*b).abs()),
(UnsignedInteger(a), LargeSignedInteger(b)) => i128::from(*a).abs().cmp(&b.abs()),
(SignedInteger(a), LargeSignedInteger(b)) => i128::from(*a).abs().cmp(&b.abs()),
Expand Down Expand Up @@ -159,14 +163,14 @@ impl Value {
} else {
1
}
},
}
LargeSignedInteger(v) => {
if *v >= 0 {
0
} else {
1
}
},
}
Float(_) => 7,
Bytes(_) => 2,
Text(_) => 3,
Expand Down
2 changes: 1 addition & 1 deletion src/value/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl serde::Serializer for Serializer {
}

fn serialize_i128(self, value: i128) -> Result<Value, Error> {
if value > 2i128.pow(64)-1 || value < -(2i128.pow(64)) {
if value > 2i128.pow(64) - 1 || value < -(2i128.pow(64)) {
return Err(Error::message("The number can't be stored in CBOR"));
}

Expand Down
5 changes: 4 additions & 1 deletion tests/enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,10 @@ mod std_tests {

// tuple-variants serialize like ["<variant>", values..]
let number_s = to_vec_legacy(&Bar::Number(42)).unwrap();
let number_vec = vec![Value::Text("Number".to_string()), Value::UnsignedInteger(42)];
let number_vec = vec![
Value::Text("Number".to_string()),
Value::UnsignedInteger(42),
];
let number_vec_s = to_vec_legacy(&number_vec).unwrap();
assert_eq!(number_s, number_vec_s);

Expand Down

0 comments on commit 7d7fcc4

Please sign in to comment.