Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit b884e11

Browse files
committed
Auto merge of #1305 - alexheretic:master, r=Xanewok
Fix some clippys
2 parents c4e4da9 + a1a68e4 commit b884e11

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

tests/client.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,35 +1090,35 @@ fn client_find_definitions() {
10901090

10911091
let expected = [
10921092
// struct Foo
1093-
(1, 15, vec![foo_definition.clone()]),
1094-
(1, 16, vec![foo_definition.clone()]),
1095-
(1, 17, vec![foo_definition.clone()]),
1096-
(1, 18, vec![foo_definition.clone()]),
1093+
(1, 15, vec![foo_definition]),
1094+
(1, 16, vec![foo_definition]),
1095+
(1, 17, vec![foo_definition]),
1096+
(1, 18, vec![foo_definition]),
10971097
// impl Foo
1098-
(4, 13, vec![foo_definition.clone()]),
1099-
(4, 14, vec![foo_definition.clone()]),
1100-
(4, 15, vec![foo_definition.clone()]),
1101-
(4, 16, vec![foo_definition.clone()]),
1098+
(4, 13, vec![foo_definition]),
1099+
(4, 14, vec![foo_definition]),
1100+
(4, 15, vec![foo_definition]),
1101+
(4, 16, vec![foo_definition]),
11021102
// fn new
1103-
(5, 15, vec![foo_new_definition.clone()]),
1104-
(5, 16, vec![foo_new_definition.clone()]),
1105-
(5, 17, vec![foo_new_definition.clone()]),
1106-
(5, 18, vec![foo_new_definition.clone()]),
1103+
(5, 15, vec![foo_new_definition]),
1104+
(5, 16, vec![foo_new_definition]),
1105+
(5, 17, vec![foo_new_definition]),
1106+
(5, 18, vec![foo_new_definition]),
11071107
// fn main
1108-
(9, 11, vec![main_definition.clone()]),
1109-
(9, 12, vec![main_definition.clone()]),
1110-
(9, 13, vec![main_definition.clone()]),
1111-
(9, 14, vec![main_definition.clone()]),
1112-
(9, 15, vec![main_definition.clone()]),
1108+
(9, 11, vec![main_definition]),
1109+
(9, 12, vec![main_definition]),
1110+
(9, 13, vec![main_definition]),
1111+
(9, 14, vec![main_definition]),
1112+
(9, 15, vec![main_definition]),
11131113
// Foo::new()
1114-
(10, 12, vec![foo_definition.clone()]),
1115-
(10, 13, vec![foo_definition.clone()]),
1116-
(10, 14, vec![foo_definition.clone()]),
1117-
(10, 15, vec![foo_definition.clone()]),
1118-
(10, 17, vec![foo_new_definition.clone()]),
1119-
(10, 18, vec![foo_new_definition.clone()]),
1120-
(10, 19, vec![foo_new_definition.clone()]),
1121-
(10, 20, vec![foo_new_definition.clone()]),
1114+
(10, 12, vec![foo_definition]),
1115+
(10, 13, vec![foo_definition]),
1116+
(10, 14, vec![foo_definition]),
1117+
(10, 15, vec![foo_definition]),
1118+
(10, 17, vec![foo_new_definition]),
1119+
(10, 18, vec![foo_new_definition]),
1120+
(10, 19, vec![foo_new_definition]),
1121+
(10, 20, vec![foo_new_definition]),
11221122
];
11231123

11241124
if results.len() != expected.len() {

tests/tests_old.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,23 +1092,23 @@ pub trait ConvertStringCase {
10921092

10931093
struct CamelCaseConverter;
10941094
impl ConvertStringCase for CamelCaseConverter {
1095-
fn convert_string_case<'a>(s: &'a str) -> String {
1095+
fn convert_string_case(s: &str) -> String {
10961096
use heck::CamelCase;
10971097
s.to_camel_case().to_string()
10981098
}
10991099
}
11001100

11011101
struct KebabCaseConverter;
11021102
impl ConvertStringCase for KebabCaseConverter {
1103-
fn convert_string_case<'a>(s: &'a str) -> String {
1103+
fn convert_string_case(s: &str) -> String {
11041104
use heck::KebabCase;
11051105
s.to_kebab_case().to_string()
11061106
}
11071107
}
11081108

11091109
struct SnakeCaseConverter;
11101110
impl ConvertStringCase for SnakeCaseConverter {
1111-
fn convert_string_case<'a>(s: &'a str) -> String {
1111+
fn convert_string_case(s: &str) -> String {
11121112
use heck::SnakeCase;
11131113
s.to_snake_case().to_string()
11141114
}

0 commit comments

Comments
 (0)