Auto merge of #48999 - GuillaumeGomez:add-repeat-on-slice, r=Kimundi
Add repeat method on slice Fixes #48784.
This commit is contained in:
commit
f305b025cf
19
src/liballoc/repeat-generic-slice.rs
Normal file
19
src/liballoc/repeat-generic-slice.rs
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
#![feature(repeat_generic_slice)]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
assert_eq!([1, 2].repeat(2), vec![1, 2, 1, 2]);
|
||||||
|
assert_eq!([1, 2, 3, 4].repeat(0), vec![]);
|
||||||
|
assert_eq!([1, 2, 3, 4].repeat(1), vec![1, 2, 3, 4]);
|
||||||
|
assert_eq!([1, 2, 3, 4].repeat(3),
|
||||||
|
vec![1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4]);
|
||||||
|
}
|
@ -394,6 +394,77 @@ impl<T> [T] {
|
|||||||
// NB see hack module in this file
|
// NB see hack module in this file
|
||||||
hack::into_vec(self)
|
hack::into_vec(self)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Creates a vector by repeating a slice `n` times.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// Basic usage:
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(repeat_generic_slice)]
|
||||||
|
///
|
||||||
|
/// fn main() {
|
||||||
|
/// assert_eq!([1, 2].repeat(3), vec![1, 2, 1, 2, 1, 2]);
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
#[unstable(feature = "repeat_generic_slice",
|
||||||
|
reason = "it's on str, why not on slice?",
|
||||||
|
issue = "48784")]
|
||||||
|
pub fn repeat(&self, n: usize) -> Vec<T> where T: Copy {
|
||||||
|
if n == 0 {
|
||||||
|
return Vec::new();
|
||||||
|
}
|
||||||
|
|
||||||
|
// If `n` is larger than zero, it can be split as
|
||||||
|
// `n = 2^expn + rem (2^expn > rem, expn >= 0, rem >= 0)`.
|
||||||
|
// `2^expn` is the number represented by the leftmost '1' bit of `n`,
|
||||||
|
// and `rem` is the remaining part of `n`.
|
||||||
|
|
||||||
|
// Using `Vec` to access `set_len()`.
|
||||||
|
let mut buf = Vec::with_capacity(self.len() * n);
|
||||||
|
|
||||||
|
// `2^expn` repetition is done by doubling `buf` `expn`-times.
|
||||||
|
buf.extend(self);
|
||||||
|
{
|
||||||
|
let mut m = n >> 1;
|
||||||
|
// If `m > 0`, there are remaining bits up to the leftmost '1'.
|
||||||
|
while m > 0 {
|
||||||
|
// `buf.extend(buf)`:
|
||||||
|
unsafe {
|
||||||
|
ptr::copy_nonoverlapping(
|
||||||
|
buf.as_ptr(),
|
||||||
|
(buf.as_mut_ptr() as *mut T).add(buf.len()),
|
||||||
|
buf.len(),
|
||||||
|
);
|
||||||
|
// `buf` has capacity of `self.len() * n`.
|
||||||
|
let buf_len = buf.len();
|
||||||
|
buf.set_len(buf_len * 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
m >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// `rem` (`= n - 2^expn`) repetition is done by copying
|
||||||
|
// first `rem` repetitions from `buf` itself.
|
||||||
|
let rem_len = self.len() * n - buf.len(); // `self.len() * rem`
|
||||||
|
if rem_len > 0 {
|
||||||
|
// `buf.extend(buf[0 .. rem_len])`:
|
||||||
|
unsafe {
|
||||||
|
// This is non-overlapping since `2^expn > rem`.
|
||||||
|
ptr::copy_nonoverlapping(
|
||||||
|
buf.as_ptr(),
|
||||||
|
(buf.as_mut_ptr() as *mut T).add(buf.len()),
|
||||||
|
rem_len,
|
||||||
|
);
|
||||||
|
// `buf.len() + rem_len` equals to `buf.capacity()` (`= self.len() * n`).
|
||||||
|
let buf_cap = buf.capacity();
|
||||||
|
buf.set_len(buf_cap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buf
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(stage0, lang = "slice_u8")]
|
#[cfg_attr(stage0, lang = "slice_u8")]
|
||||||
|
@ -436,59 +436,7 @@ impl str {
|
|||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "repeat_str", since = "1.16.0")]
|
#[stable(feature = "repeat_str", since = "1.16.0")]
|
||||||
pub fn repeat(&self, n: usize) -> String {
|
pub fn repeat(&self, n: usize) -> String {
|
||||||
if n == 0 {
|
unsafe { String::from_utf8_unchecked(self.as_bytes().repeat(n)) }
|
||||||
return String::new();
|
|
||||||
}
|
|
||||||
|
|
||||||
// If `n` is larger than zero, it can be split as
|
|
||||||
// `n = 2^expn + rem (2^expn > rem, expn >= 0, rem >= 0)`.
|
|
||||||
// `2^expn` is the number represented by the leftmost '1' bit of `n`,
|
|
||||||
// and `rem` is the remaining part of `n`.
|
|
||||||
|
|
||||||
// Using `Vec` to access `set_len()`.
|
|
||||||
let mut buf = Vec::with_capacity(self.len() * n);
|
|
||||||
|
|
||||||
// `2^expn` repetition is done by doubling `buf` `expn`-times.
|
|
||||||
buf.extend(self.as_bytes());
|
|
||||||
{
|
|
||||||
let mut m = n >> 1;
|
|
||||||
// If `m > 0`, there are remaining bits up to the leftmost '1'.
|
|
||||||
while m > 0 {
|
|
||||||
// `buf.extend(buf)`:
|
|
||||||
unsafe {
|
|
||||||
ptr::copy_nonoverlapping(
|
|
||||||
buf.as_ptr(),
|
|
||||||
(buf.as_mut_ptr() as *mut u8).add(buf.len()),
|
|
||||||
buf.len(),
|
|
||||||
);
|
|
||||||
// `buf` has capacity of `self.len() * n`.
|
|
||||||
let buf_len = buf.len();
|
|
||||||
buf.set_len(buf_len * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
m >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// `rem` (`= n - 2^expn`) repetition is done by copying
|
|
||||||
// first `rem` repetitions from `buf` itself.
|
|
||||||
let rem_len = self.len() * n - buf.len(); // `self.len() * rem`
|
|
||||||
if rem_len > 0 {
|
|
||||||
// `buf.extend(buf[0 .. rem_len])`:
|
|
||||||
unsafe {
|
|
||||||
// This is non-overlapping since `2^expn > rem`.
|
|
||||||
ptr::copy_nonoverlapping(
|
|
||||||
buf.as_ptr(),
|
|
||||||
(buf.as_mut_ptr() as *mut u8).add(buf.len()),
|
|
||||||
rem_len,
|
|
||||||
);
|
|
||||||
// `buf.len() + rem_len` equals to `buf.capacity()` (`= self.len() * n`).
|
|
||||||
let buf_cap = buf.capacity();
|
|
||||||
buf.set_len(buf_cap);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe { String::from_utf8_unchecked(buf) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns a copy of this string where each character is mapped to its
|
/// Returns a copy of this string where each character is mapped to its
|
||||||
|
Loading…
x
Reference in New Issue
Block a user