Skip to content

Commit 4737c5a

Browse files
committed
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
1 parent e64efc9 commit 4737c5a

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/libcore/slice/mod.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
1717
#![stable(feature = "rust1", since = "1.0.0")]
1818

19-
// FIXME: replace remaining ... by ..= after next stage0
20-
// Silence warning: "... is being replaced by ..="
21-
#![cfg_attr(not(stage0), allow(warnings))]
19+
// FIXME: after next stage0, change RangeInclusive { ... } back to ..=
20+
use ops::RangeInclusive;
2221

2322
// How this module is organized.
2423
//
@@ -1048,32 +1047,32 @@ impl<T> SliceIndex<[T]> for ops::RangeToInclusive<usize> {
10481047

10491048
#[inline]
10501049
fn get(self, slice: &[T]) -> Option<&[T]> {
1051-
(0...self.end).get(slice)
1050+
(RangeInclusive { start: 0, end: self.end }).get(slice)
10521051
}
10531052

10541053
#[inline]
10551054
fn get_mut(self, slice: &mut [T]) -> Option<&mut [T]> {
1056-
(0...self.end).get_mut(slice)
1055+
(RangeInclusive { start: 0, end: self.end }).get_mut(slice)
10571056
}
10581057

10591058
#[inline]
10601059
unsafe fn get_unchecked(self, slice: &[T]) -> &[T] {
1061-
(0...self.end).get_unchecked(slice)
1060+
(RangeInclusive { start: 0, end: self.end }).get_unchecked(slice)
10621061
}
10631062

10641063
#[inline]
10651064
unsafe fn get_unchecked_mut(self, slice: &mut [T]) -> &mut [T] {
1066-
(0...self.end).get_unchecked_mut(slice)
1065+
(RangeInclusive { start: 0, end: self.end }).get_unchecked_mut(slice)
10671066
}
10681067

10691068
#[inline]
10701069
fn index(self, slice: &[T]) -> &[T] {
1071-
(0...self.end).index(slice)
1070+
(RangeInclusive { start: 0, end: self.end }).index(slice)
10721071
}
10731072

10741073
#[inline]
10751074
fn index_mut(self, slice: &mut [T]) -> &mut [T] {
1076-
(0...self.end).index_mut(slice)
1075+
(RangeInclusive { start: 0, end: self.end }).index_mut(slice)
10771076
}
10781077
}
10791078

0 commit comments

Comments
 (0)