Skip to content

Commit c1472c5

Browse files
committed
Add const cloning of slices and tests
1 parent 5b150d2 commit c1472c5

File tree

3 files changed

+94
-10
lines changed

3 files changed

+94
-10
lines changed

library/core/src/slice/mod.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use crate::clone::TrivialClone;
1010
use crate::cmp::Ordering::{self, Equal, Greater, Less};
1111
use crate::intrinsics::{exact_div, unchecked_sub};
12+
use crate::marker::Destruct;
1213
use crate::mem::{self, MaybeUninit, SizedTypeProperties};
1314
use crate::num::NonZero;
1415
use crate::ops::{OneSidedRange, OneSidedRangeBound, Range, RangeBounds, RangeInclusive};
@@ -3823,9 +3824,10 @@ impl<T> [T] {
38233824
/// [`split_at_mut`]: slice::split_at_mut
38243825
#[stable(feature = "clone_from_slice", since = "1.7.0")]
38253826
#[track_caller]
3826-
pub fn clone_from_slice(&mut self, src: &[T])
3827+
#[rustc_const_unstable(feature = "const_clone", issue = "142757")]
3828+
pub const fn clone_from_slice(&mut self, src: &[T])
38273829
where
3828-
T: Clone,
3830+
T: [const] Clone + [const] Destruct,
38293831
{
38303832
self.spec_clone_from(src);
38313833
}
@@ -5136,13 +5138,17 @@ const unsafe fn copy_from_slice_impl<T: Clone>(dest: &mut [T], src: &[T]) {
51365138
}
51375139
}
51385140

5139-
trait CloneFromSpec<T> {
5140-
fn spec_clone_from(&mut self, src: &[T]);
5141+
#[rustc_const_unstable(feature = "const_clone", issue = "142757")]
5142+
const trait CloneFromSpec<T> {
5143+
fn spec_clone_from(&mut self, src: &[T])
5144+
where
5145+
T: [const] Destruct;
51415146
}
51425147

5143-
impl<T> CloneFromSpec<T> for [T]
5148+
#[rustc_const_unstable(feature = "const_clone", issue = "142757")]
5149+
impl<T> const CloneFromSpec<T> for [T]
51445150
where
5145-
T: Clone,
5151+
T: [const] Clone + [const] Destruct,
51465152
{
51475153
#[track_caller]
51485154
default fn spec_clone_from(&mut self, src: &[T]) {
@@ -5152,15 +5158,19 @@ where
51525158
// But since it can't be relied on we also have an explicit specialization for T: Copy.
51535159
let len = self.len();
51545160
let src = &src[..len];
5155-
for i in 0..len {
5156-
self[i].clone_from(&src[i]);
5161+
// FIXME(const_hack): make this a `for idx in 0..self.len()` loop.
5162+
let mut idx = 0;
5163+
while idx < self.len() {
5164+
self[idx].clone_from(&src[idx]);
5165+
idx += 1;
51575166
}
51585167
}
51595168
}
51605169

5161-
impl<T> CloneFromSpec<T> for [T]
5170+
#[rustc_const_unstable(feature = "const_clone", issue = "142757")]
5171+
impl<T> const CloneFromSpec<T> for [T]
51625172
where
5163-
T: TrivialClone,
5173+
T: [const] TrivialClone + [const] Destruct,
51645174
{
51655175
#[track_caller]
51665176
fn spec_clone_from(&mut self, src: &[T]) {

library/coretests/tests/clone.rs

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,74 @@ fn cstr_metadata_is_length_with_nul() {
121121
let bytes: *const [u8] = p as *const [u8];
122122
assert_eq!(s.to_bytes_with_nul().len(), bytes.len());
123123
}
124+
125+
#[test]
126+
fn test_const_clone() {
127+
const {
128+
let bool: bool = Default::default();
129+
let char: char = Default::default();
130+
let ascii_char: std::ascii::Char = Default::default();
131+
let usize: usize = Default::default();
132+
let u8: u8 = Default::default();
133+
let u16: u16 = Default::default();
134+
let u32: u32 = Default::default();
135+
let u64: u64 = Default::default();
136+
let u128: u128 = Default::default();
137+
let i8: i8 = Default::default();
138+
let i16: i16 = Default::default();
139+
let i32: i32 = Default::default();
140+
let i64: i64 = Default::default();
141+
let i128: i128 = Default::default();
142+
let f16: f16 = Default::default();
143+
let f32: f32 = Default::default();
144+
let f64: f64 = Default::default();
145+
let f128: f128 = Default::default();
146+
147+
let bool_clone: bool = bool.clone();
148+
let char_clone: char = char.clone();
149+
let ascii_char_clone: std::ascii::Char = ascii_char.clone();
150+
151+
let usize_clone: usize = usize.clone();
152+
let u8_clone: u8 = u8.clone();
153+
let u16_clone: u16 = u16.clone();
154+
let u32_clone: u32 = u32.clone();
155+
let u64_clone: u64 = u64.clone();
156+
let u128_clone: u128 = u128.clone();
157+
let i8_clone: i8 = i8.clone();
158+
let i16_clone: i16 = i16.clone();
159+
let i32_clone: i32 = i32.clone();
160+
let i64_clone: i64 = i64.clone();
161+
let i128_clone: i128 = i128.clone();
162+
let f16_clone: f16 = f16.clone();
163+
let f32_clone: f32 = f32.clone();
164+
let f64_clone: f64 = f64.clone();
165+
let f128_clone: f128 = f128.clone();
166+
167+
assert!(bool == bool_clone);
168+
assert!(char == char_clone);
169+
assert!(ascii_char == ascii_char_clone);
170+
assert!(usize == usize_clone);
171+
assert!(u8 == u8_clone);
172+
assert!(u16 == u16_clone);
173+
assert!(u32 == u32_clone);
174+
assert!(u64 == u64_clone);
175+
assert!(u128 == u128_clone);
176+
assert!(i8 == i8_clone);
177+
assert!(i16 == i16_clone);
178+
assert!(i32 == i32_clone);
179+
assert!(i64 == i64_clone);
180+
assert!(i128 == i128_clone);
181+
assert!(f16 == f16_clone);
182+
assert!(f32 == f32_clone);
183+
assert!(f64 == f64_clone);
184+
assert!(f128 == f128_clone);
185+
186+
let src: [i32; 4] = [1, 2, 3, 4];
187+
let mut dst: [i32; 2] = [0, 0];
188+
189+
dst.clone_from_slice(&src[2..]);
190+
191+
assert!(src == [1, 2, 3, 4]);
192+
assert!(dst == [3, 4]);
193+
}
194+
}

library/coretests/tests/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@
1919
#![feature(clone_to_uninit)]
2020
#![feature(const_array)]
2121
#![feature(const_cell_traits)]
22+
#![feature(const_clone)]
2223
#![feature(const_cmp)]
2324
#![feature(const_convert)]
25+
#![feature(const_default)]
2426
#![feature(const_destruct)]
2527
#![feature(const_drop_in_place)]
2628
#![feature(const_eval_select)]
29+
#![feature(const_index)]
2730
#![feature(const_ops)]
2831
#![feature(const_option_ops)]
2932
#![feature(const_ref_cell)]

0 commit comments

Comments
 (0)