Skip to content

Commit 70887f6

Browse files
authored
Rollup merge of rust-lang#76273 - CraftSpider:master, r=matklad
Move some Vec UI tests into alloc unit tests A bit of work towards rust-lang#76268, makes a number of the Vec UI tests that are simply running code into unit tests. Ensured that they are being run when testing liballoc locally.
2 parents 2ba25e9 + 2278c72 commit 70887f6

File tree

7 files changed

+56
-69
lines changed

7 files changed

+56
-69
lines changed

library/alloc/tests/vec.rs

+56
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,42 @@ fn test_zst_capacity() {
7474
assert_eq!(Vec::<()>::new().capacity(), usize::MAX);
7575
}
7676

77+
#[test]
78+
fn test_indexing() {
79+
let v: Vec<isize> = vec![10, 20];
80+
assert_eq!(v[0], 10);
81+
assert_eq!(v[1], 20);
82+
let mut x: usize = 0;
83+
assert_eq!(v[x], 10);
84+
assert_eq!(v[x + 1], 20);
85+
x = x + 1;
86+
assert_eq!(v[x], 20);
87+
assert_eq!(v[x - 1], 10);
88+
}
89+
90+
#[test]
91+
fn test_debug_fmt() {
92+
let vec1: Vec<isize> = vec![];
93+
assert_eq!("[]", format!("{:?}", vec1));
94+
95+
let vec2 = vec![0, 1];
96+
assert_eq!("[0, 1]", format!("{:?}", vec2));
97+
98+
let slice: &[isize] = &[4, 5];
99+
assert_eq!("[4, 5]", format!("{:?}", slice));
100+
}
101+
102+
#[test]
103+
fn test_push() {
104+
let mut v = vec![];
105+
v.push(1);
106+
assert_eq!(v, [1]);
107+
v.push(2);
108+
assert_eq!(v, [1, 2]);
109+
v.push(3);
110+
assert_eq!(v, [1, 2, 3]);
111+
}
112+
77113
#[test]
78114
fn test_extend() {
79115
let mut v = Vec::new();
@@ -119,6 +155,18 @@ fn test_extend() {
119155
assert_eq!(count_x, 1);
120156
}
121157

158+
#[test]
159+
fn test_extend_from_slice() {
160+
let a: Vec<isize> = vec![1, 2, 3, 4, 5];
161+
let b: Vec<isize> = vec![6, 7, 8, 9, 0];
162+
163+
let mut v: Vec<isize> = a;
164+
165+
v.extend_from_slice(&b);
166+
167+
assert_eq!(v, [1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
168+
}
169+
122170
#[test]
123171
fn test_extend_ref() {
124172
let mut v = vec![1, 2];
@@ -134,6 +182,14 @@ fn test_extend_ref() {
134182
assert_eq!(v, [1, 2, 3, 4, 5, 6, 7]);
135183
}
136184

185+
#[test]
186+
fn test_slice_from_ref() {
187+
let values = vec![1, 2, 3, 4, 5];
188+
let slice = &values[1..3];
189+
190+
assert_eq!(slice, [2, 3]);
191+
}
192+
137193
#[test]
138194
fn test_slice_from_mut() {
139195
let mut values = vec![1, 2, 3, 4, 5];

src/test/ui/array-slice-vec/vec-concat.rs

-14
This file was deleted.

src/test/ui/array-slice-vec/vec-growth.rs

-16
This file was deleted.

src/test/ui/array-slice-vec/vec-push.rs

-3
This file was deleted.

src/test/ui/array-slice-vec/vec-slice.rs

-9
This file was deleted.

src/test/ui/array-slice-vec/vec-to_str.rs

-12
This file was deleted.

src/test/ui/array-slice-vec/vec.rs

-15
This file was deleted.

0 commit comments

Comments
 (0)