提交 4b2f40df 编写于 作者: S Simon Sapin

Remove unused Step methods

上级 dbed18ca
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
reason = "likely to be replaced by finer-grained traits", reason = "likely to be replaced by finer-grained traits",
issue = "42168")] issue = "42168")]
pub trait Step: PartialOrd + Sized { pub trait Step: PartialOrd + Sized {
/// Steps `self` if possible.
fn step(&self, by: &Self) -> Option<Self>;
/// Returns the number of steps between two step objects. The count is /// Returns the number of steps between two step objects. The count is
/// inclusive of `start` and exclusive of `end`. /// inclusive of `start` and exclusive of `end`.
/// ///
...@@ -35,9 +32,6 @@ pub trait Step: PartialOrd + Sized { ...@@ -35,9 +32,6 @@ pub trait Step: PartialOrd + Sized {
/// Same as `steps_between`, but with a `by` of 1 /// Same as `steps_between`, but with a `by` of 1
fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize>; fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize>;
/// Tests whether this step is negative or not (going backwards)
fn is_negative(&self) -> bool;
/// Replaces this step with `1`, returning itself /// Replaces this step with `1`, returning itself
fn replace_one(&mut self) -> Self; fn replace_one(&mut self) -> Self;
...@@ -57,10 +51,6 @@ pub trait Step: PartialOrd + Sized { ...@@ -57,10 +51,6 @@ pub trait Step: PartialOrd + Sized {
reason = "likely to be replaced by finer-grained traits", reason = "likely to be replaced by finer-grained traits",
issue = "42168")] issue = "42168")]
impl Step for $t { impl Step for $t {
#[inline]
fn step(&self, by: &$t) -> Option<$t> {
(*self).checked_add(*by)
}
#[inline] #[inline]
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> { fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> {
...@@ -79,11 +69,6 @@ fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> { ...@@ -79,11 +69,6 @@ fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> {
} }
} }
#[inline]
fn is_negative(&self) -> bool {
false
}
#[inline] #[inline]
fn replace_one(&mut self) -> Self { fn replace_one(&mut self) -> Self {
mem::replace(self, 1) mem::replace(self, 1)
...@@ -117,10 +102,6 @@ fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize> { ...@@ -117,10 +102,6 @@ fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize> {
reason = "likely to be replaced by finer-grained traits", reason = "likely to be replaced by finer-grained traits",
issue = "42168")] issue = "42168")]
impl Step for $t { impl Step for $t {
#[inline]
fn step(&self, by: &$t) -> Option<$t> {
(*self).checked_add(*by)
}
#[inline] #[inline]
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> { fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> {
...@@ -150,11 +131,6 @@ fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> { ...@@ -150,11 +131,6 @@ fn steps_between(start: &$t, end: &$t, by: &$t) -> Option<usize> {
} }
} }
#[inline]
fn is_negative(&self) -> bool {
*self < 0
}
#[inline] #[inline]
fn replace_one(&mut self) -> Self { fn replace_one(&mut self) -> Self {
mem::replace(self, 1) mem::replace(self, 1)
...@@ -189,21 +165,11 @@ fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize> { ...@@ -189,21 +165,11 @@ fn steps_between_by_one(start: &Self, end: &Self) -> Option<usize> {
reason = "likely to be replaced by finer-grained traits", reason = "likely to be replaced by finer-grained traits",
issue = "42168")] issue = "42168")]
impl Step for $t { impl Step for $t {
#[inline]
fn step(&self, by: &$t) -> Option<$t> {
(*self).checked_add(*by)
}
#[inline] #[inline]
fn steps_between(_a: &$t, _b: &$t, _by: &$t) -> Option<usize> { fn steps_between(_a: &$t, _b: &$t, _by: &$t) -> Option<usize> {
None None
} }
#[inline]
#[allow(unused_comparisons)]
fn is_negative(&self) -> bool {
*self < 0
}
#[inline] #[inline]
fn replace_one(&mut self) -> Self { fn replace_one(&mut self) -> Self {
mem::replace(self, 1) mem::replace(self, 1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册