about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBadel2 <2badel2@gmail.com>2017-09-20 20:57:18 +0200
committerBadel2 <2badel2@gmail.com>2017-09-22 22:05:18 +0200
commit4737c5a068a38e4b004180b3f39bb0974190b06e (patch)
tree34a1b6964146a1976a427a36bdc3da3fe2bb38ab
parente64efc91f49affb265328e354c8c8f0544daa462 (diff)
downloadrust-4737c5a068a38e4b004180b3f39bb0974190b06e.tar.gz
rust-4737c5a068a38e4b004180b3f39bb0974190b06e.zip
Substitute `...` with the expanded form
RangeInclusive { start, end }, this way we supress the warnings about `...` in expressions being deprecated until `..=` is available in the compiler
-rw-r--r--src/libcore/slice/mod.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs
index c52e88170ae..ae243f3f246 100644
--- a/src/libcore/slice/mod.rs
+++ b/src/libcore/slice/mod.rs
@@ -16,9 +16,8 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-// FIXME: replace remaining ... by ..= after next stage0
-// Silence warning: "... is being replaced by ..="
-#![cfg_attr(not(stage0), allow(warnings))]
+// FIXME: after next stage0, change RangeInclusive { ... } back to ..=
+use ops::RangeInclusive;
 
 // How this module is organized.
 //
@@ -1048,32 +1047,32 @@ impl<T> SliceIndex<[T]> for ops::RangeToInclusive<usize> {
 
     #[inline]
     fn get(self, slice: &[T]) -> Option<&[T]> {
-        (0...self.end).get(slice)
+        (RangeInclusive { start: 0, end: self.end }).get(slice)
     }
 
     #[inline]
     fn get_mut(self, slice: &mut [T]) -> Option<&mut [T]> {
-        (0...self.end).get_mut(slice)
+        (RangeInclusive { start: 0, end: self.end }).get_mut(slice)
     }
 
     #[inline]
     unsafe fn get_unchecked(self, slice: &[T]) -> &[T] {
-        (0...self.end).get_unchecked(slice)
+        (RangeInclusive { start: 0, end: self.end }).get_unchecked(slice)
     }
 
     #[inline]
     unsafe fn get_unchecked_mut(self, slice: &mut [T]) -> &mut [T] {
-        (0...self.end).get_unchecked_mut(slice)
+        (RangeInclusive { start: 0, end: self.end }).get_unchecked_mut(slice)
     }
 
     #[inline]
     fn index(self, slice: &[T]) -> &[T] {
-        (0...self.end).index(slice)
+        (RangeInclusive { start: 0, end: self.end }).index(slice)
     }
 
     #[inline]
     fn index_mut(self, slice: &mut [T]) -> &mut [T] {
-        (0...self.end).index_mut(slice)
+        (RangeInclusive { start: 0, end: self.end }).index_mut(slice)
     }
 }