2019-04-10 08:16:07 +02:00
|
|
|
// run-rustfix
|
|
|
|
|
2018-12-09 23:26:16 +01:00
|
|
|
#![allow(
|
|
|
|
unused,
|
|
|
|
clippy::no_effect,
|
|
|
|
clippy::redundant_closure_call,
|
|
|
|
clippy::many_single_char_names,
|
|
|
|
clippy::needless_pass_by_value,
|
|
|
|
clippy::option_map_unit_fn,
|
|
|
|
clippy::trivially_copy_pass_by_ref
|
|
|
|
)]
|
2018-07-28 17:34:52 +02:00
|
|
|
#![warn(clippy::redundant_closure, clippy::needless_borrow)]
|
2015-05-10 07:09:04 +02:00
|
|
|
|
2019-02-10 12:58:51 +01:00
|
|
|
use std::path::PathBuf;
|
|
|
|
|
2015-05-10 07:09:04 +02:00
|
|
|
fn main() {
|
2015-08-14 14:21:05 +02:00
|
|
|
let a = Some(1u8).map(|a| foo(a));
|
|
|
|
meta(|a| foo(a));
|
|
|
|
let c = Some(1u8).map(|a| {1+2; foo}(a));
|
|
|
|
let d = Some(1u8).map(|a| foo((|b| foo2(b))(a))); //is adjusted?
|
|
|
|
all(&[1, 2, 3], &&2, |x, y| below(x, y)); //is adjusted
|
2015-08-26 17:09:37 +02:00
|
|
|
unsafe {
|
|
|
|
Some(1u8).map(|a| unsafe_fn(a)); // unsafe fn
|
|
|
|
}
|
2016-01-18 19:28:06 +01:00
|
|
|
|
2016-03-30 23:07:21 +02:00
|
|
|
// See #815
|
|
|
|
let e = Some(1u8).map(|a| divergent(a));
|
|
|
|
let e = Some(1u8).map(|a| generic(a));
|
|
|
|
let e = Some(1u8).map(generic);
|
2016-01-18 19:28:06 +01:00
|
|
|
// See #515
|
|
|
|
let a: Option<Box<::std::ops::Deref<Target = [i32]>>> =
|
|
|
|
Some(vec![1i32, 2]).map(|v| -> Box<::std::ops::Deref<Target = [i32]>> { Box::new(v) });
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
trait TestTrait {
|
|
|
|
fn trait_foo(self) -> bool;
|
|
|
|
fn trait_foo_ref(&self) -> bool;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct TestStruct<'a> {
|
2019-02-10 21:23:04 +01:00
|
|
|
some_ref: &'a i32,
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TestStruct<'a> {
|
2019-02-10 21:23:04 +01:00
|
|
|
fn foo(self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
unsafe fn foo_unsafe(self) -> bool {
|
|
|
|
true
|
|
|
|
}
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TestTrait for TestStruct<'a> {
|
2019-02-10 21:23:04 +01:00
|
|
|
fn trait_foo(self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
fn trait_foo_ref(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> std::ops::Deref for TestStruct<'a> {
|
|
|
|
type Target = char;
|
2019-02-10 21:23:04 +01:00
|
|
|
fn deref(&self) -> &char {
|
|
|
|
&'a'
|
|
|
|
}
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
fn test_redundant_closures_containing_method_calls() {
|
|
|
|
let i = 10;
|
2019-02-10 21:23:04 +01:00
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo());
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(TestStruct::foo);
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo());
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo_ref());
|
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(TestTrait::trait_foo);
|
|
|
|
let e = Some(&mut vec![1, 2, 3]).map(|v| v.clear());
|
|
|
|
let e = Some(&mut vec![1, 2, 3]).map(std::vec::Vec::clear);
|
2019-02-10 12:58:51 +01:00
|
|
|
unsafe {
|
2019-02-10 21:23:04 +01:00
|
|
|
let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo_unsafe());
|
2019-02-10 12:58:51 +01:00
|
|
|
}
|
|
|
|
let e = Some("str").map(|s| s.to_string());
|
|
|
|
let e = Some("str").map(str::to_string);
|
|
|
|
let e = Some('a').map(|s| s.to_uppercase());
|
|
|
|
let e = Some('a').map(char::to_uppercase);
|
2019-02-10 21:23:04 +01:00
|
|
|
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(|c| c.to_ascii_uppercase()).collect();
|
|
|
|
let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(char::to_ascii_uppercase).collect();
|
2019-02-10 12:58:51 +01:00
|
|
|
let p = Some(PathBuf::new());
|
|
|
|
let e = p.as_ref().and_then(|s| s.to_str());
|
2019-02-10 21:23:04 +01:00
|
|
|
let c = Some(TestStruct { some_ref: &i })
|
|
|
|
.as_ref()
|
|
|
|
.map(|c| c.to_ascii_uppercase());
|
2019-02-26 12:12:27 +01:00
|
|
|
|
|
|
|
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());
|
|
|
|
}
|
2015-08-14 14:21:05 +02:00
|
|
|
}
|
|
|
|
|
2018-12-09 23:26:16 +01:00
|
|
|
fn meta<F>(f: F)
|
|
|
|
where
|
|
|
|
F: Fn(u8),
|
|
|
|
{
|
2015-08-14 14:21:05 +02:00
|
|
|
f(1u8)
|
2015-05-10 07:09:04 +02:00
|
|
|
}
|
|
|
|
|
2018-12-09 23:26:16 +01:00
|
|
|
fn foo(_: u8) {}
|
2015-05-10 07:09:04 +02:00
|
|
|
|
2015-08-14 14:21:05 +02:00
|
|
|
fn foo2(_: u8) -> u8 {
|
2015-05-10 07:09:04 +02:00
|
|
|
1u8
|
2015-08-12 10:46:49 +02:00
|
|
|
}
|
2015-08-14 14:21:05 +02:00
|
|
|
|
|
|
|
fn all<X, F>(x: &[X], y: &X, f: F) -> bool
|
2018-12-09 23:26:16 +01:00
|
|
|
where
|
|
|
|
F: Fn(&X, &X) -> bool,
|
|
|
|
{
|
2015-08-14 14:21:05 +02:00
|
|
|
x.iter().all(|e| f(e, y))
|
|
|
|
}
|
|
|
|
|
2018-12-09 23:26:16 +01:00
|
|
|
fn below(x: &u8, y: &u8) -> bool {
|
|
|
|
x < y
|
|
|
|
}
|
2015-08-26 17:09:37 +02:00
|
|
|
|
2018-12-09 23:26:16 +01:00
|
|
|
unsafe fn unsafe_fn(_: u8) {}
|
2016-03-30 23:07:21 +02:00
|
|
|
|
|
|
|
fn divergent(_: u8) -> ! {
|
|
|
|
unimplemented!()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn generic<T>(_: T) -> u8 {
|
|
|
|
0
|
|
|
|
}
|
2019-03-31 14:10:17 +02:00
|
|
|
|
|
|
|
fn passes_fn_mut(mut x: Box<dyn FnMut()>) {
|
|
|
|
requires_fn_once(|| x());
|
|
|
|
}
|
|
|
|
fn requires_fn_once<T: FnOnce()>(_: T) {}
|
2019-04-20 22:20:14 +02:00
|
|
|
|
|
|
|
fn test_redundant_closure_with_function_pointer() {
|
|
|
|
type FnPtrType = fn(u8);
|
|
|
|
let foo_ptr: FnPtrType = foo;
|
|
|
|
let a = Some(1u8).map(|a| foo_ptr(a));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn test_redundant_closure_with_another_closure() {
|
|
|
|
let closure = |a| println!("{}", a);
|
|
|
|
let a = Some(1u8).map(|a| closure(a));
|
|
|
|
}
|