2019-04-10 01:16:07 -05:00
|
|
|
// run-rustfix
|
|
|
|
|
|
|
|
#![allow(
|
|
|
|
unused,
|
|
|
|
clippy::no_effect,
|
|
|
|
clippy::redundant_closure_call,
|
|
|
|
clippy::needless_pass_by_value,
|
2020-04-02 20:46:01 -05:00
|
|
|
clippy::option_map_unit_fn
|
2019-04-10 01:16:07 -05:00
|
|
|
)]
|
2019-05-16 01:25:39 -05:00
|
|
|
#![warn(
|
|
|
|
clippy::redundant_closure,
|
2019-05-16 13:18:07 -05:00
|
|
|
clippy::redundant_closure_for_method_calls,
|
2019-05-16 01:25:39 -05:00
|
|
|
clippy::needless_borrow
|
|
|
|
)]
|
2019-04-10 01:16:07 -05:00
|
|
|
|
2021-09-09 15:35:26 -05:00
|
|
|
use std::path::{Path, PathBuf};
|
2019-04-10 01:16:07 -05:00
|
|
|
|
2021-03-08 12:59:58 -06:00
|
|
|
macro_rules! mac {
|
|
|
|
() => {
|
|
|
|
foobar()
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
macro_rules! closure_mac {
|
|
|
|
() => {
|
|
|
|
|n| foo(n)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2019-04-10 01:16:07 -05:00
|
|
|
fn main() {
|
|
|
|
let a = Some(1u8).map(foo);
|
2019-06-10 04:22:33 -05:00
|
|
|
let c = Some(1u8).map(|a| {1+2; foo}(a));
|
2021-03-08 12:59:58 -06:00
|
|
|
true.then(|| mac!()); // don't lint function in macro expansion
|
|
|
|
Some(1).map(closure_mac!()); // don't lint closure in macro expansion
|
|
|
|
let _: Option<Vec<u8>> = true.then(std::vec::Vec::new); // special case vec!
|
2021-09-09 15:35:26 -05:00
|
|
|
let d = Some(1u8).map(|a| foo(foo2(a))); //is adjusted?
|
|
|
|
all(&[1, 2, 3], &2, below); //is adjusted
|
2019-04-10 01:16:07 -05:00
|
|
|
unsafe {
|
|
|
|
Some(1u8).map(|a| unsafe_fn(a)); // unsafe fn
|
|
|
|
}
|
|
|
|
|
|
|
|
// See #815
|
2021-09-09 15:35:26 -05:00
|
|
|
let e = Some(1u8).map(divergent);
|
2019-04-10 01:16:07 -05:00
|
|
|
let e = Some(1u8).map(generic);
|
|
|
|
let e = Some(1u8).map(generic);
|
|
|
|
// See #515
|
2019-05-30 01:23:47 -05:00
|
|
|
let a: Option<Box<dyn (::std::ops::Deref<Target = [i32]>)>> =
|
|
|
|
Some(vec![1i32, 2]).map(|v| -> Box<dyn (::std::ops::Deref<Target = [i32]>)> { Box::new(v) });
|
2021-05-21 14:42:57 -05:00
|
|
|
|
|
|
|
// issue #7224
|
|
|
|
let _: Option<Vec<u32>> = Some(0).map(|_| vec![]);
|
2019-04-10 01:16:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
trait TestTrait {
|
|
|
|
fn trait_foo(self) -> bool;
|
|
|
|
fn trait_foo_ref(&self) -> bool;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct TestStruct<'a> {
|
|
|
|
some_ref: &'a i32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TestStruct<'a> {
|
|
|
|
fn foo(self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
unsafe fn foo_unsafe(self) -> bool {
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TestTrait for TestStruct<'a> {
|
|
|
|
fn trait_foo(self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
fn trait_foo_ref(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> std::ops::Deref for TestStruct<'a> {
|
|
|
|
type Target = char;
|
|
|
|
fn deref(&self) -> &char {
|
|
|
|
&'a'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_redundant_closures_containing_method_calls() {
|
|
|
|
let i = 10;
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(TestStruct::foo);
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(TestTrait::trait_foo);
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo_ref());
|
|
|
|
let e = Some(&mut vec![1, 2, 3]).map(std::vec::Vec::clear);
|
|
|
|
unsafe {
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo_unsafe());
|
|
|
|
}
|
|
|
|
let e = Some("str").map(std::string::ToString::to_string);
|
|
|
|
let e = Some('a').map(char::to_uppercase);
|
|
|
|
let e: std::vec::Vec<usize> = vec!['a', 'b', 'c'].iter().map(|c| c.len_utf8()).collect();
|
|
|
|
let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(char::to_ascii_uppercase).collect();
|
2021-09-09 15:35:26 -05:00
|
|
|
let e = Some(PathBuf::new()).as_ref().and_then(|s| s.to_str());
|
2019-04-10 01:16:07 -05:00
|
|
|
let c = Some(TestStruct { some_ref: &i })
|
|
|
|
.as_ref()
|
|
|
|
.map(|c| c.to_ascii_uppercase());
|
|
|
|
|
|
|
|
fn test_different_borrow_levels<T>(t: &[&T])
|
|
|
|
where
|
|
|
|
T: TestTrait,
|
|
|
|
{
|
|
|
|
t.iter().filter(|x| x.trait_foo_ref());
|
|
|
|
t.iter().map(|x| x.trait_foo_ref());
|
|
|
|
}
|
2019-04-25 14:46:34 -05:00
|
|
|
}
|
|
|
|
|
2019-05-30 01:23:47 -05:00
|
|
|
struct Thunk<T>(Box<dyn FnMut() -> T>);
|
2019-04-25 14:46:34 -05:00
|
|
|
|
|
|
|
impl<T> Thunk<T> {
|
|
|
|
fn new<F: 'static + FnOnce() -> T>(f: F) -> Thunk<T> {
|
|
|
|
let mut option = Some(f);
|
|
|
|
// This should not trigger redundant_closure (#1439)
|
|
|
|
Thunk(Box::new(move || option.take().unwrap()()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn unwrap(self) -> T {
|
|
|
|
let Thunk(mut f) = self;
|
|
|
|
f()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn foobar() {
|
|
|
|
let thunk = Thunk::new(|| println!("Hello, world!"));
|
|
|
|
thunk.unwrap()
|
2019-04-10 01:16:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(_: u8) {}
|
|
|
|
|
|
|
|
fn foo2(_: u8) -> u8 {
|
|
|
|
1u8
|
|
|
|
}
|
|
|
|
|
|
|
|
fn all<X, F>(x: &[X], y: &X, f: F) -> bool
|
|
|
|
where
|
|
|
|
F: Fn(&X, &X) -> bool,
|
|
|
|
{
|
|
|
|
x.iter().all(|e| f(e, y))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn below(x: &u8, y: &u8) -> bool {
|
|
|
|
x < y
|
|
|
|
}
|
|
|
|
|
|
|
|
unsafe fn unsafe_fn(_: u8) {}
|
|
|
|
|
|
|
|
fn divergent(_: u8) -> ! {
|
|
|
|
unimplemented!()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn generic<T>(_: T) -> u8 {
|
|
|
|
0
|
|
|
|
}
|
2019-03-31 07:10:17 -05:00
|
|
|
|
|
|
|
fn passes_fn_mut(mut x: Box<dyn FnMut()>) {
|
2021-09-09 15:35:26 -05:00
|
|
|
requires_fn_once(x);
|
2019-03-31 07:10:17 -05:00
|
|
|
}
|
|
|
|
fn requires_fn_once<T: FnOnce()>(_: T) {}
|
2019-04-20 15:20:14 -05:00
|
|
|
|
|
|
|
fn test_redundant_closure_with_function_pointer() {
|
|
|
|
type FnPtrType = fn(u8);
|
|
|
|
let foo_ptr: FnPtrType = foo;
|
|
|
|
let a = Some(1u8).map(foo_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_redundant_closure_with_another_closure() {
|
|
|
|
let closure = |a| println!("{}", a);
|
|
|
|
let a = Some(1u8).map(closure);
|
|
|
|
}
|
2019-06-10 04:22:33 -05:00
|
|
|
|
2019-06-10 12:19:29 -05:00
|
|
|
fn make_lazy(f: impl Fn() -> fn(u8) -> u8) -> impl Fn(u8) -> u8 {
|
2019-06-10 04:22:33 -05:00
|
|
|
// Currently f is called when result of make_lazy is called.
|
|
|
|
// If the closure is removed, f will be called when make_lazy itself is
|
|
|
|
// called. This changes semantics, so the closure must stay.
|
|
|
|
Box::new(move |x| f()(x))
|
|
|
|
}
|
2019-06-09 06:24:34 -05:00
|
|
|
|
|
|
|
fn call<F: FnOnce(&mut String) -> String>(f: F) -> String {
|
|
|
|
f(&mut "Hello".to_owned())
|
|
|
|
}
|
|
|
|
fn test_difference_in_mutability() {
|
|
|
|
call(|s| s.clone());
|
|
|
|
}
|
|
|
|
|
|
|
|
struct Bar;
|
|
|
|
impl std::ops::Deref for Bar {
|
|
|
|
type Target = str;
|
|
|
|
fn deref(&self) -> &str {
|
|
|
|
"hi"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_deref_with_trait_method() {
|
|
|
|
let _ = [Bar].iter().map(|s| s.to_string()).collect::<Vec<_>>();
|
|
|
|
}
|
2021-07-02 22:25:55 -05:00
|
|
|
|
|
|
|
fn mutable_closure_used_again(x: Vec<i32>, y: Vec<i32>, z: Vec<i32>) {
|
|
|
|
let mut res = Vec::new();
|
|
|
|
let mut add_to_res = |n| res.push(n);
|
|
|
|
x.into_iter().for_each(&mut add_to_res);
|
|
|
|
y.into_iter().for_each(&mut add_to_res);
|
|
|
|
z.into_iter().for_each(add_to_res);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn mutable_closure_in_loop() {
|
|
|
|
let mut value = 0;
|
|
|
|
let mut closure = |n| value += n;
|
|
|
|
for _ in 0..5 {
|
|
|
|
Some(1).map(&mut closure);
|
|
|
|
}
|
|
|
|
}
|
2021-09-09 15:35:26 -05:00
|
|
|
|
|
|
|
fn late_bound_lifetimes() {
|
|
|
|
fn take_asref_path<P: AsRef<Path>>(path: P) {}
|
|
|
|
|
|
|
|
fn map_str<F>(thunk: F)
|
|
|
|
where
|
|
|
|
F: FnOnce(&str),
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
fn map_str_to_path<F>(thunk: F)
|
|
|
|
where
|
|
|
|
F: FnOnce(&str) -> &Path,
|
|
|
|
{
|
|
|
|
}
|
|
|
|
map_str(|s| take_asref_path(s));
|
|
|
|
map_str_to_path(std::convert::AsRef::as_ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
mod type_param_bound {
|
|
|
|
trait Trait {
|
|
|
|
fn fun();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn take<T: 'static>(_: T) {}
|
|
|
|
|
|
|
|
fn test<X: Trait>() {
|
|
|
|
// don't lint, but it's questionable that rust requires a cast
|
|
|
|
take(|| X::fun());
|
|
|
|
take(X::fun as fn());
|
|
|
|
}
|
|
|
|
}
|