blockworks-foundation
/
fixed
mirror of https://github.com/blockworks-foundation/fixed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move deprecated functions to bottom

This commit is contained in:
Trevor Spiteri 2019-01-29 20:15:10 +01:00
parent bb7d16d4cb
commit 11f6c2bb93
1 changed files with 70 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/lib.rs
View File

@ -1273,65 +1273,6 @@ assert_eq!((-two_half).to_int(), -3);",
}
);
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"`, rounding towards +∞.\n",
),
#[deprecated(since = "0.2.0", note = "use f.ceil().to_int() instead")]
#[inline]
pub fn to_int_ceil(self) -> $Inner {
if let Some(ceil) = self.checked_ceil() {
ceil.to_int()
} else {
self.floor().to_int() + 1
}
}
);
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"` rounding towards −∞.\n",
),
#[deprecated(since = "0.2.0", note = "use f.floor().to_int() instead")]
#[inline]
pub fn to_int_floor(self) -> $Inner {
if let Some(floor) = self.checked_floor() {
floor.to_int()
} else {
self.ceil().to_int() - 1
}
}
);
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"` rounding towards the nearest. Ties are rounded away from zero.\n",
),
#[deprecated(since = "0.2.0", note = "use f.round().to_int() instead")]
#[inline]
pub fn to_int_round(self) -> $Inner {
if let Some(round) = self.checked_round() {
round.to_int()
} else if let Some(floor) = self.checked_floor() {
floor.to_int() + 1
} else {
self.ceil().to_int() - 1
}
}
);
doc_comment!(
concat!(
"
@ -1709,11 +1650,6 @@ assert_eq!(Fix::overflowing_from_float(large), (wrapped, true));
}
);
#[cfg(feature = "f16")]
deprecated_from_float! { fn from_f16(f16) -> $Fixed<Frac> }
deprecated_from_float! { fn from_f32(f32) -> $Fixed<Frac> }
deprecated_from_float! { fn from_f64(f64) -> $Fixed<Frac> }
doc_comment!(
concat!(
"
@ -1759,11 +1695,6 @@ assert_eq!(Fix::from_bits(",
}
);
#[cfg(feature = "f16")]
deprecated_to_float! { fn to_f16($Fixed) -> f16 }
deprecated_to_float! { fn to_f32($Fixed) -> f32 }
deprecated_to_float! { fn to_f64($Fixed) -> f64 }
doc_comment!(
concat!(
"
@ -3130,6 +3061,76 @@ assert!(Fix::from_int(-5).is_negative());
$Fixed($Inner) => fn is_negative(self) -> bool
}
}
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"`, rounding towards +∞.\n",
),
#[deprecated(since = "0.2.0", note = "use f.ceil().to_int() instead")]
#[inline]
pub fn to_int_ceil(self) -> $Inner {
if let Some(ceil) = self.checked_ceil() {
ceil.to_int()
} else {
self.floor().to_int() + 1
}
}
);
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"` rounding towards −∞.\n",
),
#[deprecated(since = "0.2.0", note = "use f.floor().to_int() instead")]
#[inline]
pub fn to_int_floor(self) -> $Inner {
if let Some(floor) = self.checked_floor() {
floor.to_int()
} else {
self.ceil().to_int() - 1
}
}
);
doc_comment!(
concat!(
"Converts the fixed-point number of type `",
stringify!($Fixed),
"` to an integer of type `",
stringify!($Inner),
"` rounding towards the nearest. Ties are rounded away from zero.\n",
),
#[deprecated(since = "0.2.0", note = "use f.round().to_int() instead")]
#[inline]
pub fn to_int_round(self) -> $Inner {
if let Some(round) = self.checked_round() {
round.to_int()
} else if let Some(floor) = self.checked_floor() {
floor.to_int() + 1
} else {
self.ceil().to_int() - 1
}
}
);
#[cfg(feature = "f16")]
deprecated_from_float! { fn from_f16(f16) -> $Fixed<Frac> }
deprecated_from_float! { fn from_f32(f32) -> $Fixed<Frac> }
deprecated_from_float! { fn from_f64(f64) -> $Fixed<Frac> }
#[cfg(feature = "f16")]
deprecated_to_float! { fn to_f16($Fixed) -> f16 }
deprecated_to_float! { fn to_f32($Fixed) -> f32 }
deprecated_to_float! { fn to_f64($Fixed) -> f64 }
}
};
}