Skip to content

Commit

Permalink
Refactoring: tests in same_item_push
Browse files Browse the repository at this point in the history
  • Loading branch information
@giraffate
giraffate committed Sep 8, 2020
1 parent 2c9f82e commit 952c046
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 68 deletions.
99 changes: 51 additions & 48 deletions tests/ui/same_item_push.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,64 +16,76 @@ fn fun() -> usize {
}

fn main() {
// Test for basic case
let mut spaces = Vec::with_capacity(10);
for _ in 0..10 {
spaces.push(vec![b' ']);
}

let mut vec2: Vec<u8> = Vec::new();
// ** linted cases **
let mut vec: Vec<u8> = Vec::new();
let item = 2;
for _ in 5..=20 {
vec2.push(item);
vec.push(item);
}

let mut vec3: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
for _ in 0..15 {
let item = 2;
vec3.push(item);
vec.push(item);
}

let mut vec4: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
for _ in 0..15 {
vec4.push(13);
vec.push(13);
}

let mut vec = Vec::new();
for _ in 0..20 {
vec.push(VALUE);
}

let mut vec = Vec::new();
let item = VALUE;
for _ in 0..20 {
vec.push(item);
}

// ** non-linted cases **
let mut spaces = Vec::with_capacity(10);
for _ in 0..10 {
spaces.push(vec![b' ']);
}

// Suggestion should not be given as pushed variable can mutate
let mut vec5: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
let mut item: u8 = 2;
for _ in 0..30 {
vec5.push(mutate_increment(&mut item));
vec.push(mutate_increment(&mut item));
}

let mut vec6: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
let mut item: u8 = 2;
let mut item2 = &mut mutate_increment(&mut item);
for _ in 0..30 {
vec6.push(mutate_increment(item2));
vec.push(mutate_increment(item2));
}

let mut vec7: Vec<usize> = Vec::new();
let mut vec: Vec<usize> = Vec::new();
for (a, b) in [0, 1, 4, 9, 16].iter().enumerate() {
vec7.push(a);
vec.push(a);
}

let mut vec8: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
for i in 0..30 {
vec8.push(increment(i));
vec.push(increment(i));
}

let mut vec9: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
for i in 0..30 {
vec9.push(i + i * i);
vec.push(i + i * i);
}

// Suggestion should not be given as there are multiple pushes that are not the same
let mut vec10: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
let item: u8 = 2;
for _ in 0..30 {
vec10.push(item);
vec10.push(item * 2);
vec.push(item);
vec.push(item * 2);
}

// Suggestion should not be given as Vec is not involved
Expand All @@ -88,23 +100,23 @@ fn main() {
for i in 0..30 {
vec_a.push(A { kind: i });
}
let mut vec12: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
for a in vec_a {
vec12.push(2u8.pow(a.kind));
vec.push(2u8.pow(a.kind));
}

// Fix #5902
let mut vec13: Vec<u8> = Vec::new();
let mut vec: Vec<u8> = Vec::new();
let mut item = 0;
for _ in 0..10 {
vec13.push(item);
vec.push(item);
item += 10;
}

// Fix #5979
let mut vec14: Vec<std::fs::File> = Vec::new();
let mut vec: Vec<std::fs::File> = Vec::new();
for _ in 0..10 {
vec14.push(std::fs::File::open("foobar").unwrap());
vec.push(std::fs::File::open("foobar").unwrap());
}
// Fix #5979
#[derive(Clone)]
Expand All @@ -113,36 +125,27 @@ fn main() {
trait T {}
impl T for S {}

let mut vec15: Vec<Box<dyn T>> = Vec::new();
let mut vec: Vec<Box<dyn T>> = Vec::new();
for _ in 0..10 {
vec15.push(Box::new(S {}));
}

let mut vec16 = Vec::new();
for _ in 0..20 {
vec16.push(VALUE);
}

let mut vec17 = Vec::new();
let item = VALUE;
for _ in 0..20 {
vec17.push(item);
vec.push(Box::new(S {}));
}

let mut vec18 = Vec::new();
// Fix #5985
let mut vec = Vec::new();
let item = 42;
let item = fun();
for _ in 0..20 {
vec18.push(item);
vec.push(item);
}

let mut vec19 = Vec::new();
// Fix #5985
let mut vec = Vec::new();
let key = 1;
for _ in 0..20 {
let item = match key {
1 => 10,
_ => 0,
};
vec19.push(item);
vec.push(item);
}
}
40 changes: 20 additions & 20 deletions tests/ui/same_item_push.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
error: it looks like the same item is being pushed into this Vec
--> $DIR/same_item_push.rs:24:9
--> $DIR/same_item_push.rs:23:9
|
LL | vec2.push(item);
| ^^^^
LL | vec.push(item);
| ^^^
|
= note: `-D clippy::same-item-push` implied by `-D warnings`
= help: try using vec![item;SIZE] or vec2.resize(NEW_SIZE, item)
= help: try using vec![item;SIZE] or vec.resize(NEW_SIZE, item)

error: it looks like the same item is being pushed into this Vec
--> $DIR/same_item_push.rs:30:9
--> $DIR/same_item_push.rs:29:9
|
LL | vec3.push(item);
| ^^^^
LL | vec.push(item);
| ^^^
|
= help: try using vec![item;SIZE] or vec3.resize(NEW_SIZE, item)
= help: try using vec![item;SIZE] or vec.resize(NEW_SIZE, item)

error: it looks like the same item is being pushed into this Vec
--> $DIR/same_item_push.rs:35:9
--> $DIR/same_item_push.rs:34:9
|
LL | vec4.push(13);
| ^^^^
LL | vec.push(13);
| ^^^
|
= help: try using vec![13;SIZE] or vec4.resize(NEW_SIZE, 13)
= help: try using vec![13;SIZE] or vec.resize(NEW_SIZE, 13)

error: it looks like the same item is being pushed into this Vec
--> $DIR/same_item_push.rs:119:9
--> $DIR/same_item_push.rs:39:9
|
LL | vec16.push(VALUE);
| ^^^^^
LL | vec.push(VALUE);
| ^^^
|
= help: try using vec![VALUE;SIZE] or vec16.resize(NEW_SIZE, VALUE)
= help: try using vec![VALUE;SIZE] or vec.resize(NEW_SIZE, VALUE)

error: it looks like the same item is being pushed into this Vec
--> $DIR/same_item_push.rs:125:9
--> $DIR/same_item_push.rs:45:9
|
LL | vec17.push(item);
| ^^^^^
LL | vec.push(item);
| ^^^
|
= help: try using vec![item;SIZE] or vec17.resize(NEW_SIZE, item)
= help: try using vec![item;SIZE] or vec.resize(NEW_SIZE, item)

error: aborting due to 5 previous errors

0 comments on commit 952c046

Please sign in to comment.