Skip to content

Commit f7c0df9

Browse files
author
Grzegorz
committed
test formatting
1 parent 1688139 commit f7c0df9

File tree

2 files changed

+44
-36
lines changed

2 files changed

+44
-36
lines changed

‎tests/ui/eta.rs

+30-22
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ fn main() {
2828
// See #515
2929
let a: Option<Box<::std::ops::Deref<Target = [i32]>>> =
3030
Some(vec![1i32, 2]).map(|v| -> Box<::std::ops::Deref<Target = [i32]>> { Box::new(v) });
31-
3231
}
3332

3433
trait TestTrait {
@@ -37,48 +36,58 @@ trait TestTrait {
3736
}
3837

3938
struct TestStruct<'a> {
40-
some_ref: &'a i32
39+
some_ref: &'a i32,
4140
}
4241

4342
impl<'a> TestStruct<'a> {
44-
fn foo(self) -> bool { false }
45-
unsafe fn foo_unsafe(self) -> bool { true }
43+
fn foo(self) -> bool {
44+
false
45+
}
46+
unsafe fn foo_unsafe(self) -> bool {
47+
true
48+
}
4649
}
4750

4851
impl<'a> TestTrait for TestStruct<'a> {
49-
fn trait_foo(self) -> bool { false }
50-
fn trait_foo_ref(&self) -> bool { false }
52+
fn trait_foo(self) -> bool {
53+
false
54+
}
55+
fn trait_foo_ref(&self) -> bool {
56+
false
57+
}
5158
}
5259

5360
impl<'a> std::ops::Deref for TestStruct<'a> {
5461
type Target = char;
55-
fn deref(&self) -> &char { &'a' }
62+
fn deref(&self) -> &char {
63+
&'a'
64+
}
5665
}
5766

5867
fn test_redundant_closures_containing_method_calls() {
5968
let i = 10;
60-
let e = Some(TestStruct{some_ref: &i}).map(|a| a.foo());
61-
let e = Some(TestStruct{some_ref: &i}).map(TestStruct::foo);
62-
let e = Some(TestStruct{some_ref: &i}).map(|a| a.trait_foo());
63-
let e = Some(TestStruct{some_ref: &i}).map(|a| a.trait_foo_ref());
64-
let e = Some(TestStruct{some_ref: &i}).map(TestTrait::trait_foo);
65-
let e = Some(&mut vec!(1,2,3)).map(|v| v.clear());
66-
let e = Some(&mut vec!(1,2,3)).map(std::vec::Vec::clear);
69+
let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo());
70+
let e = Some(TestStruct { some_ref: &i }).map(TestStruct::foo);
71+
let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo());
72+
let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo_ref());
73+
let e = Some(TestStruct { some_ref: &i }).map(TestTrait::trait_foo);
74+
let e = Some(&mut vec![1, 2, 3]).map(|v| v.clear());
75+
let e = Some(&mut vec![1, 2, 3]).map(std::vec::Vec::clear);
6776
unsafe {
68-
let e = Some(TestStruct{some_ref: &i}).map(|a| a.foo_unsafe());
77+
let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo_unsafe());
6978
}
7079
let e = Some("str").map(|s| s.to_string());
7180
let e = Some("str").map(str::to_string);
7281
let e = Some('a').map(|s| s.to_uppercase());
7382
let e = Some('a').map(char::to_uppercase);
74-
let e: std::vec::Vec<usize> = vec!('a','b','c').iter().map(|c| c.len_utf8()).collect();
75-
let e: std::vec::Vec<char> = vec!('a','b','c').iter().map(|c| c.to_ascii_uppercase()).collect();
76-
let e: std::vec::Vec<char> = vec!('a','b','c').iter().map(char::to_ascii_uppercase).collect();
83+
let e: std::vec::Vec<usize> = vec!['a', 'b', 'c'].iter().map(|c| c.len_utf8()).collect();
84+
let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(|c| c.to_ascii_uppercase()).collect();
85+
let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(char::to_ascii_uppercase).collect();
7786
let p = Some(PathBuf::new());
7887
let e = p.as_ref().and_then(|s| s.to_str());
79-
//let e = p.as_ref().and_then(std::path::Path::to_str);
80-
let c = Some(TestStruct{some_ref: &i}).as_ref().map(|c| c.to_ascii_uppercase());
81-
//let c = Some(TestStruct{some_ref: &i}).as_ref().map(char::to_ascii_uppercase);
88+
let c = Some(TestStruct { some_ref: &i })
89+
.as_ref()
90+
.map(|c| c.to_ascii_uppercase());
8291
}
8392

8493
fn meta<F>(f: F)
@@ -114,4 +123,3 @@ fn divergent(_: u8) -> ! {
114123
fn generic<T>(_: T) -> u8 {
115124
0
116125
}
117-

‎tests/ui/eta.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -33,40 +33,40 @@ LL | let e = Some(1u8).map(|a| generic(a));
3333
| ^^^^^^^^^^^^^^ help: remove closure as shown: `generic`
3434

3535
error: redundant closure found
36-
--> $DIR/eta.rs:60:48
36+
--> $DIR/eta.rs:69:51
3737
|
38-
LL | let e = Some(TestStruct{some_ref: &i}).map(|a| a.foo());
39-
| ^^^^^^^^^^^ help: remove closure as shown: `TestStruct::foo`
38+
LL | let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo());
39+
| ^^^^^^^^^^^ help: remove closure as shown: `TestStruct::foo`
4040

4141
error: redundant closure found
42-
--> $DIR/eta.rs:62:48
42+
--> $DIR/eta.rs:71:51
4343
|
44-
LL | let e = Some(TestStruct{some_ref: &i}).map(|a| a.trait_foo());
45-
| ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `TestTrait::trait_foo`
44+
LL | let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo());
45+
| ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `TestTrait::trait_foo`
4646

4747
error: redundant closure found
48-
--> $DIR/eta.rs:65:40
48+
--> $DIR/eta.rs:74:42
4949
|
50-
LL | let e = Some(&mut vec!(1,2,3)).map(|v| v.clear());
51-
| ^^^^^^^^^^^^^ help: remove closure as shown: `std::vec::Vec::clear`
50+
LL | let e = Some(&mut vec![1, 2, 3]).map(|v| v.clear());
51+
| ^^^^^^^^^^^^^ help: remove closure as shown: `std::vec::Vec::clear`
5252

5353
error: redundant closure found
54-
--> $DIR/eta.rs:70:29
54+
--> $DIR/eta.rs:79:29
5555
|
5656
LL | let e = Some("str").map(|s| s.to_string());
5757
| ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `std::string::ToString::to_string`
5858

5959
error: redundant closure found
60-
--> $DIR/eta.rs:72:27
60+
--> $DIR/eta.rs:81:27
6161
|
6262
LL | let e = Some('a').map(|s| s.to_uppercase());
6363
| ^^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `char::to_uppercase`
6464

6565
error: redundant closure found
66-
--> $DIR/eta.rs:75:63
66+
--> $DIR/eta.rs:84:65
6767
|
68-
LL | let e: std::vec::Vec<char> = vec!('a','b','c').iter().map(|c| c.to_ascii_uppercase()).collect();
69-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `char::to_ascii_uppercase`
68+
LL | let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(|c| c.to_ascii_uppercase()).collect();
69+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `char::to_ascii_uppercase`
7070

7171
error: aborting due to 11 previous errors
7272

0 commit comments

Comments
 (0)