Skip to content

Commit

Permalink
Update type UI tests to use private items
Browse files Browse the repository at this point in the history
  • Loading branch information
xFrednet committed Aug 12, 2021
1 parent 7fe93e0 commit e67c25d
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 60 deletions.
28 changes: 16 additions & 12 deletions tests/ui/box_vec.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#![warn(clippy::all)]
#![allow(clippy::boxed_local, clippy::needless_pass_by_value)]
#![allow(clippy::blacklisted_name)]
#![allow(
clippy::boxed_local,
clippy::needless_pass_by_value,
clippy::blacklisted_name,
unused
)]

macro_rules! boxit {
($init:expr, $x:ty) => {
Expand All @@ -11,22 +15,22 @@ macro_rules! boxit {
fn test_macro() {
boxit!(Vec::new(), Vec<u8>);
}
pub fn test(foo: Box<Vec<bool>>) {
println!("{:?}", foo.get(0))
}
fn test(foo: Box<Vec<bool>>) {}

pub fn test2(foo: Box<dyn Fn(Vec<u32>)>) {
fn test2(foo: Box<dyn Fn(Vec<u32>)>) {
// pass if #31 is fixed
foo(vec![1, 2, 3])
}

pub fn test_local_not_linted() {
fn test_local_not_linted() {
let _: Box<Vec<bool>>;
}

fn main() {
test(Box::new(Vec::new()));
test2(Box::new(|v| println!("{:?}", v)));
test_macro();
test_local_not_linted();
// All of these test should be allowed because they are part of the
// public api and `avoid_breaking_exported_api` is `false` by default.
pub fn pub_test(foo: Box<Vec<bool>>) {}
pub fn pub_test_ret() -> Box<Vec<bool>> {
Box::new(Vec::new())
}

fn main() {}
6 changes: 3 additions & 3 deletions tests/ui/box_vec.stderr
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error: you seem to be trying to use `Box<Vec<T>>`. Consider using just `Vec<T>`
--> $DIR/box_vec.rs:14:18
--> $DIR/box_vec.rs:18:14
|
LL | pub fn test(foo: Box<Vec<bool>>) {
| ^^^^^^^^^^^^^^
LL | fn test(foo: Box<Vec<bool>>) {}
| ^^^^^^^^^^^^^^
|
= note: `-D clippy::box-vec` implied by `-D warnings`
= help: `Vec<T>` is already on the heap, `Box<Vec<T>>` makes an extra allocation
Expand Down
31 changes: 18 additions & 13 deletions tests/ui/linkedlist.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![feature(associated_type_defaults)]
#![warn(clippy::linkedlist)]
#![allow(dead_code, clippy::needless_pass_by_value)]
#![allow(unused, dead_code, clippy::needless_pass_by_value)]

extern crate alloc;
use alloc::collections::linked_list::LinkedList;
Expand All @@ -20,24 +20,29 @@ impl Foo for LinkedList<u8> {
const BAR: Option<LinkedList<u8>> = None;
}

struct Bar;
pub struct Bar {
priv_linked_list_field: LinkedList<u8>,
pub pub_linked_list_field: LinkedList<u8>,
}
impl Bar {
fn foo(_: LinkedList<u8>) {}
}

pub fn test(my_favourite_linked_list: LinkedList<u8>) {
println!("{:?}", my_favourite_linked_list)
}

pub fn test_ret() -> Option<LinkedList<u8>> {
unimplemented!();
// All of these test should be trigger the lint because they are not
// part of the public api
fn test(my_favorite_linked_list: LinkedList<u8>) {}
fn test_ret() -> Option<LinkedList<u8>> {
None
}

pub fn test_local_not_linted() {
fn test_local_not_linted() {
let _: LinkedList<u8>;
}

fn main() {
test(LinkedList::new());
test_local_not_linted();
// All of these test should be allowed because they are part of the
// public api and `avoid_breaking_exported_api` is `false` by default.
pub fn pub_test(the_most_awesome_linked_list: LinkedList<u8>) {}
pub fn pub_test_ret() -> Option<LinkedList<u8>> {
None
}

fn main() {}
24 changes: 16 additions & 8 deletions tests/ui/linkedlist.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,36 @@ LL | const BAR: Option<LinkedList<u8>>;
= help: a `VecDeque` might work

error: you seem to be using a `LinkedList`! Perhaps you meant some other data structure?
--> $DIR/linkedlist.rs:25:15
--> $DIR/linkedlist.rs:24:29
|
LL | priv_linked_list_field: LinkedList<u8>,
| ^^^^^^^^^^^^^^
|
= help: a `VecDeque` might work

error: you seem to be using a `LinkedList`! Perhaps you meant some other data structure?
--> $DIR/linkedlist.rs:28:15
|
LL | fn foo(_: LinkedList<u8>) {}
| ^^^^^^^^^^^^^^
|
= help: a `VecDeque` might work

error: you seem to be using a `LinkedList`! Perhaps you meant some other data structure?
--> $DIR/linkedlist.rs:28:39
--> $DIR/linkedlist.rs:33:34
|
LL | pub fn test(my_favourite_linked_list: LinkedList<u8>) {
| ^^^^^^^^^^^^^^
LL | fn test(my_favorite_linked_list: LinkedList<u8>) {}
| ^^^^^^^^^^^^^^
|
= help: a `VecDeque` might work

error: you seem to be using a `LinkedList`! Perhaps you meant some other data structure?
--> $DIR/linkedlist.rs:32:29
--> $DIR/linkedlist.rs:34:25
|
LL | pub fn test_ret() -> Option<LinkedList<u8>> {
| ^^^^^^^^^^^^^^
LL | fn test_ret() -> Option<LinkedList<u8>> {
| ^^^^^^^^^^^^^^
|
= help: a `VecDeque` might work

error: aborting due to 8 previous errors
error: aborting due to 9 previous errors

32 changes: 17 additions & 15 deletions tests/ui/rc_mutex.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
#![warn(clippy::rc_mutex)]
#![allow(clippy::blacklisted_name)]
#![allow(unused, clippy::blacklisted_name)]

use std::rc::Rc;
use std::sync::Mutex;

pub struct MyStruct {
pub struct MyStructWithPrivItem {
foo: Rc<Mutex<i32>>,
}

pub struct MyStructWithPubItem {
pub foo: Rc<Mutex<i32>>,
}

pub struct SubT<T> {
foo: T,
}
Expand All @@ -17,18 +21,16 @@ pub enum MyEnum {
Two,
}

pub fn test1<T>(foo: Rc<Mutex<T>>) {}

pub fn test2(foo: Rc<Mutex<MyEnum>>) {}
// All of these test should be trigger the lint because they are not
// part of the public api
fn test1<T>(foo: Rc<Mutex<T>>) {}
fn test2(foo: Rc<Mutex<MyEnum>>) {}
fn test3(foo: Rc<Mutex<SubT<usize>>>) {}

pub fn test3(foo: Rc<Mutex<SubT<usize>>>) {}
// All of these test should be allowed because they are part of the
// public api and `avoid_breaking_exported_api` is `false` by default.
pub fn pub_test1<T>(foo: Rc<Mutex<T>>) {}
pub fn pub_test2(foo: Rc<Mutex<MyEnum>>) {}
pub fn pub_test3(foo: Rc<Mutex<SubT<usize>>>) {}

fn main() {
test1(Rc::new(Mutex::new(1)));
test2(Rc::new(Mutex::new(MyEnum::One)));
test3(Rc::new(Mutex::new(SubT { foo: 1 })));

let _my_struct = MyStruct {
foo: Rc::new(Mutex::new(1)),
};
}
fn main() {}
18 changes: 9 additions & 9 deletions tests/ui/rc_mutex.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ LL | foo: Rc<Mutex<i32>>,
= help: consider using `Rc<RefCell<_>>` or `Arc<Mutex<_>>` instead

error: usage of `Rc<Mutex<_>>`
--> $DIR/rc_mutex.rs:20:22
--> $DIR/rc_mutex.rs:26:18
|
LL | pub fn test1<T>(foo: Rc<Mutex<T>>) {}
| ^^^^^^^^^^^^
LL | fn test1<T>(foo: Rc<Mutex<T>>) {}
| ^^^^^^^^^^^^
|
= help: consider using `Rc<RefCell<_>>` or `Arc<Mutex<_>>` instead

error: usage of `Rc<Mutex<_>>`
--> $DIR/rc_mutex.rs:22:19
--> $DIR/rc_mutex.rs:27:15
|
LL | pub fn test2(foo: Rc<Mutex<MyEnum>>) {}
| ^^^^^^^^^^^^^^^^^
LL | fn test2(foo: Rc<Mutex<MyEnum>>) {}
| ^^^^^^^^^^^^^^^^^
|
= help: consider using `Rc<RefCell<_>>` or `Arc<Mutex<_>>` instead

error: usage of `Rc<Mutex<_>>`
--> $DIR/rc_mutex.rs:24:19
--> $DIR/rc_mutex.rs:28:15
|
LL | pub fn test3(foo: Rc<Mutex<SubT<usize>>>) {}
| ^^^^^^^^^^^^^^^^^^^^^^
LL | fn test3(foo: Rc<Mutex<SubT<usize>>>) {}
| ^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider using `Rc<RefCell<_>>` or `Arc<Mutex<_>>` instead

Expand Down

0 comments on commit e67c25d

Please sign in to comment.