Skip to content

Commit 6d2c640

Browse files
committed
rollup merge of rust-lang#23886: demelev/remove_as_slice_usage
2 parents 5e0bda0 + df65f59 commit 6d2c640

File tree

24 files changed

+41
-42
lines changed

24 files changed

+41
-42
lines changed

src/liballoc/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ use heap::deallocate;
110110
/// let child_numbers = shared_numbers.clone();
111111
///
112112
/// thread::spawn(move || {
113-
/// let local_numbers = child_numbers.as_slice();
113+
/// let local_numbers = &child_numbers[..];
114114
///
115115
/// // Work with the local numbers
116116
/// });

src/libcollections/slice.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ impl<T> [T] {
557557
/// ```rust
558558
/// # #![feature(core)]
559559
/// let s = [0, 1, 1, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55];
560-
/// let s = s.as_slice();
561560
///
562561
/// let seek = 13;
563562
/// assert_eq!(s.binary_search_by(|probe| probe.cmp(&seek)), Ok(9));
@@ -924,7 +923,6 @@ impl<T> [T] {
924923
/// ```rust
925924
/// # #![feature(core)]
926925
/// let s = [0, 1, 1, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55];
927-
/// let s = s.as_slice();
928926
///
929927
/// assert_eq!(s.binary_search(&13), Ok(9));
930928
/// assert_eq!(s.binary_search(&4), Err(7));

src/libcollections/str.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,12 +1470,12 @@ impl str {
14701470
/// let gr1 = "a\u{310}e\u{301}o\u{308}\u{332}".graphemes(true).collect::<Vec<&str>>();
14711471
/// let b: &[_] = &["a\u{310}", "e\u{301}", "o\u{308}\u{332}"];
14721472
///
1473-
/// assert_eq!(gr1.as_slice(), b);
1473+
/// assert_eq!(&gr1[..], b);
14741474
///
14751475
/// let gr2 = "a\r\nb🇷🇺🇸🇹".graphemes(true).collect::<Vec<&str>>();
14761476
/// let b: &[_] = &["a", "\r\n", "b", "🇷🇺🇸🇹"];
14771477
///
1478-
/// assert_eq!(gr2.as_slice(), b);
1478+
/// assert_eq!(&gr2[..], b);
14791479
/// ```
14801480
#[unstable(feature = "unicode",
14811481
reason = "this functionality may only be provided by libunicode")]
@@ -1493,7 +1493,7 @@ impl str {
14931493
/// let gr_inds = "a̐éö̲\r\n".grapheme_indices(true).collect::<Vec<(usize, &str)>>();
14941494
/// let b: &[_] = &[(0, "a̐"), (3, "é"), (6, "ö̲"), (11, "\r\n")];
14951495
///
1496-
/// assert_eq!(gr_inds.as_slice(), b);
1496+
/// assert_eq!(&gr_inds[..], b);
14971497
/// ```
14981498
#[unstable(feature = "unicode",
14991499
reason = "this functionality may only be provided by libunicode")]

src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl String {
9393
/// ```
9494
/// # #![feature(collections, core)]
9595
/// let s = String::from_str("hello");
96-
/// assert_eq!(s.as_slice(), "hello");
96+
/// assert_eq!(&s[..], "hello");
9797
/// ```
9898
#[inline]
9999
#[unstable(feature = "collections",

src/libcollections/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,13 +823,13 @@ impl<T> Vec<T> {
823823
/// # #![feature(collections, core)]
824824
/// let v = vec![0, 1, 2];
825825
/// let w = v.map_in_place(|i| i + 3);
826-
/// assert_eq!(w.as_slice(), [3, 4, 5].as_slice());
826+
/// assert_eq!(&w[..], &[3, 4, 5]);
827827
///
828828
/// #[derive(PartialEq, Debug)]
829829
/// struct Newtype(u8);
830830
/// let bytes = vec![0x11, 0x22];
831831
/// let newtyped_bytes = bytes.map_in_place(|x| Newtype(x));
832-
/// assert_eq!(newtyped_bytes.as_slice(), [Newtype(0x11), Newtype(0x22)].as_slice());
832+
/// assert_eq!(&newtyped_bytes[..], &[Newtype(0x11), Newtype(0x22)]);
833833
/// ```
834834
#[unstable(feature = "collections",
835835
reason = "API may change to provide stronger guarantees")]

src/libcollections/vec_deque.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,8 @@ impl<T> VecDeque<T> {
527527
/// buf.push_back(3);
528528
/// buf.push_back(4);
529529
/// let b: &[_] = &[&5, &3, &4];
530-
/// assert_eq!(buf.iter().collect::<Vec<&i32>>().as_slice(), b);
530+
/// let c: Vec<&i32> = buf.iter().collect();
531+
/// assert_eq!(&c[..], b);
531532
/// ```
532533
#[stable(feature = "rust1", since = "1.0.0")]
533534
pub fn iter(&self) -> Iter<T> {

src/libcollectionstest/fmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ use std::fmt;
1313
#[test]
1414
fn test_format() {
1515
let s = fmt::format(format_args!("Hello, {}!", "world"));
16-
assert_eq!(s.as_slice(), "Hello, world!");
16+
assert_eq!(&s[..], "Hello, world!");
1717
}

src/libcollectionstest/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn test_from_elem() {
5959
// Test on-heap from_elem.
6060
v = vec![20; 6];
6161
{
62-
let v = v.as_slice();
62+
let v = &v[..];
6363
assert_eq!(v[0], 20);
6464
assert_eq!(v[1], 20);
6565
assert_eq!(v[2], 20);

src/libcollectionstest/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,9 +1470,9 @@ fn test_split_strator() {
14701470
fn test_str_default() {
14711471
use std::default::Default;
14721472

1473-
fn t<S: Default + Str>() {
1473+
fn t<S: Default + AsRef<str>>() {
14741474
let s: S = Default::default();
1475-
assert_eq!(s.as_slice(), "");
1475+
assert_eq!(s.as_ref(), "");
14761476
}
14771477

14781478
t::<&str>();

src/libcore/iter.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ pub trait Iterator {
624624
/// let a = [1, 2, 3, 4, 5];
625625
/// let mut it = a.iter();
626626
/// assert!(it.any(|x| *x == 3));
627-
/// assert_eq!(it.as_slice(), [4, 5]);
627+
/// assert_eq!(&it[..], [4, 5]);
628628
///
629629
/// ```
630630
#[inline]
@@ -648,7 +648,7 @@ pub trait Iterator {
648648
/// let a = [1, 2, 3, 4, 5];
649649
/// let mut it = a.iter();
650650
/// assert_eq!(it.find(|&x| *x == 3).unwrap(), &3);
651-
/// assert_eq!(it.as_slice(), [4, 5]);
651+
/// assert_eq!(&it[..], [4, 5]);
652652
#[inline]
653653
#[stable(feature = "rust1", since = "1.0.0")]
654654
fn find<P>(&mut self, mut predicate: P) -> Option<Self::Item> where
@@ -672,7 +672,7 @@ pub trait Iterator {
672672
/// let a = [1, 2, 3, 4, 5];
673673
/// let mut it = a.iter();
674674
/// assert_eq!(it.position(|x| *x == 3).unwrap(), 2);
675-
/// assert_eq!(it.as_slice(), [4, 5]);
675+
/// assert_eq!(&it[..], [4, 5]);
676676
#[inline]
677677
#[stable(feature = "rust1", since = "1.0.0")]
678678
fn position<P>(&mut self, mut predicate: P) -> Option<usize> where
@@ -702,7 +702,7 @@ pub trait Iterator {
702702
/// let a = [1, 2, 2, 4, 5];
703703
/// let mut it = a.iter();
704704
/// assert_eq!(it.rposition(|x| *x == 2).unwrap(), 2);
705-
/// assert_eq!(it.as_slice(), [1, 2]);
705+
/// assert_eq!(&it[..], [1, 2]);
706706
#[inline]
707707
#[stable(feature = "rust1", since = "1.0.0")]
708708
fn rposition<P>(&mut self, mut predicate: P) -> Option<usize> where

0 commit comments

Comments
 (0)