diff options
| author | bors <bors@rust-lang.org> | 2017-05-26 15:31:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-26 15:31:49 +0000 |
| commit | 256e497fe63bf4b13f7c0b58fa17360ca849c54d (patch) | |
| tree | 48ce0f683bf00fa6f1225aa1a77ba735b03412ad /src/libcore | |
| parent | c732446eddeb2d387763c7974d7e78217e44519a (diff) | |
| parent | 252a28638396d72f4c3a3dff6717b7aaddc017cc (diff) | |
| download | rust-256e497fe63bf4b13f7c0b58fa17360ca849c54d.tar.gz rust-256e497fe63bf4b13f7c0b58fa17360ca849c54d.zip | |
Auto merge of #42245 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests - Successful merges: #42169, #42215, #42216, #42224, #42230, #42236, #42241 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter/mod.rs | 2 | ||||
| -rw-r--r-- | src/libcore/iter/range.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs index 424c24814ac..5eefa59e7ea 100644 --- a/src/libcore/iter/mod.rs +++ b/src/libcore/iter/mod.rs @@ -309,7 +309,7 @@ pub use self::iterator::Iterator; #[unstable(feature = "step_trait", reason = "likely to be replaced by finer-grained traits", - issue = "27741")] + issue = "42168")] pub use self::range::Step; #[unstable(feature = "step_by", reason = "recent addition", issue = "27741")] diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs index 02d38ccea44..e02823fd812 100644 --- a/src/libcore/iter/range.rs +++ b/src/libcore/iter/range.rs @@ -20,7 +20,7 @@ use super::{FusedIterator, TrustedLen}; /// two `Step` objects. #[unstable(feature = "step_trait", reason = "likely to be replaced by finer-grained traits", - issue = "27741")] + issue = "42168")] pub trait Step: PartialOrd + Sized { /// Steps `self` if possible. fn step(&self, by: &Self) -> Option<Self>; @@ -55,7 +55,7 @@ macro_rules! step_impl_unsigned { ($($t:ty)*) => ($( #[unstable(feature = "step_trait", reason = "likely to be replaced by finer-grained traits", - issue = "27741")] + issue = "42168")] impl Step for $t { #[inline] fn step(&self, by: &$t) -> Option<$t> { @@ -115,7 +115,7 @@ macro_rules! step_impl_signed { ($($t:ty)*) => ($( #[unstable(feature = "step_trait", reason = "likely to be replaced by finer-grained traits", - issue = "27741")] + issue = "42168")] impl Step for $t { #[inline] fn step(&self, by: &$t) -> Option<$t> { @@ -187,7 +187,7 @@ macro_rules! step_impl_no_between { ($($t:ty)*) => ($( #[unstable(feature = "step_trait", reason = "likely to be replaced by finer-grained traits", - issue = "27741")] + issue = "42168")] impl Step for $t { #[inline] fn step(&self, by: &$t) -> Option<$t> { |