Skip to content

Commit 2a8eee4

Browse files
martskinsautozimu
martskins
authored and
autozimu
committed
Fix multiple clippy issues
1 parent 90f8923 commit 2a8eee4

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

‎src/language_client.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ impl LanguageClient {
2323
// garbage collected as a result of another modification updating the hash map, while something was holding the lock
2424
pub fn get_client_update_mutex(&self, languageId: LanguageId) -> Fallible<Arc<Mutex<()>>> {
2525
let map_guard = self.clients_mutex.lock();
26-
if map_guard.is_err() {
27-
return Err(format_err!(
26+
let mut map = map_guard.or_else(|err| {
27+
Err(format_err!(
2828
"Failed to lock client creation for languageId {:?}: {:?}",
2929
languageId,
30-
map_guard.unwrap_err()
31-
));
32-
}
33-
let mut map = map_guard.unwrap();
30+
err,
31+
))
32+
})?;
3433
if !map.contains_key(&languageId) {
3534
map.insert(languageId.clone(), Arc::new(Mutex::new(())));
3635
}

‎src/language_server_protocol.rs‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl LanguageClient {
319319
let languageId = self.vim()?.get_languageId(&filename, &Value::Null)?;
320320
let position = self.vim()?.get_position(&Value::Null)?;
321321

322-
let result = self.get_client(&Some(languageId.clone()))?.call(
322+
let result = self.get_client(&Some(languageId))?.call(
323323
lsp::request::DocumentHighlightRequest::METHOD,
324324
TextDocumentPositionParams {
325325
text_document: TextDocumentIdentifier {
@@ -999,7 +999,6 @@ impl LanguageClient {
999999
}),
10001000
publish_diagnostics: Some(PublishDiagnosticsCapability {
10011001
related_information: Some(true),
1002-
..PublishDiagnosticsCapability::default()
10031002
}),
10041003
..TextDocumentClientCapabilities::default()
10051004
}),
@@ -1044,7 +1043,7 @@ impl LanguageClient {
10441043
info!("Begin {}", lsp::notification::Initialized::METHOD);
10451044
let filename = self.vim()?.get_filename(params)?;
10461045
let languageId = self.vim()?.get_languageId(&filename, params)?;
1047-
self.get_client(&Some(languageId.clone()))?
1046+
self.get_client(&Some(languageId))?
10481047
.notify(lsp::notification::Initialized::METHOD, InitializedParams {})?;
10491048
info!("End {}", lsp::notification::Initialized::METHOD);
10501049
Ok(())
@@ -1057,7 +1056,7 @@ impl LanguageClient {
10571056
let languageId = self.vim()?.get_languageId(&filename, params)?;
10581057
let position = self.vim()?.get_position(params)?;
10591058

1060-
let result = self.get_client(&Some(languageId.clone()))?.call(
1059+
let result = self.get_client(&Some(languageId))?.call(
10611060
lsp::request::HoverRequest::METHOD,
10621061
TextDocumentPositionParams {
10631062
text_document: TextDocumentIdentifier {
@@ -1110,9 +1109,7 @@ impl LanguageClient {
11101109
})?
11111110
.combine(params);
11121111

1113-
let result = self
1114-
.get_client(&Some(languageId.clone()))?
1115-
.call(&method, &params)?;
1112+
let result = self.get_client(&Some(languageId))?.call(&method, &params)?;
11161113

11171114
if !self.vim()?.get_handle(&params)? {
11181115
return Ok(result);
@@ -1176,7 +1173,7 @@ impl LanguageClient {
11761173
return Ok(Value::Null);
11771174
}
11781175

1179-
let result = self.get_client(&Some(languageId.clone()))?.call(
1176+
let result = self.get_client(&Some(languageId))?.call(
11801177
lsp::request::Rename::METHOD,
11811178
RenameParams {
11821179
text_document_position: TextDocumentPositionParams {
@@ -1210,7 +1207,7 @@ impl LanguageClient {
12101207
let filename = self.vim()?.get_filename(params)?;
12111208
let languageId = self.vim()?.get_languageId(&filename, params)?;
12121209

1213-
let result = self.get_client(&Some(languageId.clone()))?.call(
1210+
let result = self.get_client(&Some(languageId))?.call(
12141211
lsp::request::DocumentSymbolRequest::METHOD,
12151212
DocumentSymbolParams {
12161213
text_document: TextDocumentIdentifier {
@@ -1358,7 +1355,7 @@ impl LanguageClient {
13581355
.collect()
13591356
})?;
13601357

1361-
let result: Value = self.get_client(&Some(languageId.clone()))?.call(
1358+
let result: Value = self.get_client(&Some(languageId))?.call(
13621359
lsp::request::CodeActionRequest::METHOD,
13631360
CodeActionParams {
13641361
text_document: TextDocumentIdentifier {
@@ -1428,7 +1425,7 @@ impl LanguageClient {
14281425
let languageId = self.vim()?.get_languageId(&filename, params)?;
14291426
let position = self.vim()?.get_position(params)?;
14301427

1431-
let result = self.get_client(&Some(languageId.clone()))?.call(
1428+
let result = self.get_client(&Some(languageId))?.call(
14321429
lsp::request::Completion::METHOD,
14331430
TextDocumentPositionParams {
14341431
text_document: TextDocumentIdentifier {
@@ -1453,7 +1450,7 @@ impl LanguageClient {
14531450
let languageId = self.vim()?.get_languageId(&filename, params)?;
14541451
let position = self.vim()?.get_position(params)?;
14551452

1456-
let result = self.get_client(&Some(languageId.clone()))?.call(
1453+
let result = self.get_client(&Some(languageId))?.call(
14571454
lsp::request::SignatureHelpRequest::METHOD,
14581455
TextDocumentPositionParams {
14591456
text_document: TextDocumentIdentifier {
@@ -1537,7 +1534,7 @@ impl LanguageClient {
15371534

15381535
let tab_size = self.vim()?.get_tab_size()?;
15391536
let insert_spaces = self.vim()?.get_insert_spaces(&filename)?;
1540-
let result = self.get_client(&Some(languageId.clone()))?.call(
1537+
let result = self.get_client(&Some(languageId))?.call(
15411538
lsp::request::Formatting::METHOD,
15421539
DocumentFormattingParams {
15431540
text_document: TextDocumentIdentifier {
@@ -1578,7 +1575,7 @@ impl LanguageClient {
15781575

15791576
let tab_size = self.vim()?.get_tab_size()?;
15801577
let insert_spaces = self.vim()?.get_insert_spaces(&filename)?;
1581-
let result = self.get_client(&Some(languageId.clone()))?.call(
1578+
let result = self.get_client(&Some(languageId))?.call(
15821579
lsp::request::RangeFormatting::METHOD,
15831580
DocumentRangeFormattingParams {
15841581
text_document: TextDocumentIdentifier {
@@ -1626,7 +1623,7 @@ impl LanguageClient {
16261623
.ok_or_else(|| err_msg("completionItem not found in request!"))?;
16271624

16281625
let result = self
1629-
.get_client(&Some(languageId.clone()))?
1626+
.get_client(&Some(languageId))?
16301627
.call(lsp::request::ResolveCompletionItem::METHOD, completion_item)?;
16311628

16321629
if !self.vim()?.get_handle(params)? {
@@ -1649,7 +1646,7 @@ impl LanguageClient {
16491646
let languageId = self.vim()?.get_languageId(&filename, params)?;
16501647

16511648
let query = try_get("query", params)?.unwrap_or_default();
1652-
let result = self.get_client(&Some(languageId.clone()))?.call(
1649+
let result = self.get_client(&Some(languageId))?.call(
16531650
lsp::request::WorkspaceSymbol::METHOD,
16541651
WorkspaceSymbolParams { query },
16551652
)?;
@@ -1724,7 +1721,7 @@ impl LanguageClient {
17241721
let arguments: Vec<Value> = try_get("arguments", params)?
17251722
.ok_or_else(|| err_msg("argument not found in request!"))?;
17261723

1727-
let result = self.get_client(&Some(languageId.clone()))?.call(
1724+
let result = self.get_client(&Some(languageId))?.call(
17281725
lsp::request::ExecuteCommand::METHOD,
17291726
ExecuteCommandParams { command, arguments },
17301727
)?;
@@ -1754,7 +1751,7 @@ impl LanguageClient {
17541751
let languageId = self.vim()?.get_languageId(&filename, params)?;
17551752
let settings: Value = try_get("settings", params)?.unwrap_or_default();
17561753

1757-
self.get_client(&Some(languageId.clone()))?.notify(
1754+
self.get_client(&Some(languageId))?.notify(
17581755
lsp::notification::DidChangeConfiguration::METHOD,
17591756
DidChangeConfigurationParams { settings },
17601757
)?;
@@ -1842,7 +1839,7 @@ impl LanguageClient {
18421839
Ok(version)
18431840
})?;
18441841

1845-
self.get_client(&Some(languageId.clone()))?.notify(
1842+
self.get_client(&Some(languageId))?.notify(
18461843
lsp::notification::DidChangeTextDocument::METHOD,
18471844
DidChangeTextDocumentParams {
18481845
text_document: VersionedTextDocumentIdentifier {
@@ -1871,10 +1868,10 @@ impl LanguageClient {
18711868

18721869
let uri = filename.to_url()?;
18731870

1874-
self.get_client(&Some(languageId.clone()))?.notify(
1871+
self.get_client(&Some(languageId))?.notify(
18751872
lsp::notification::DidSaveTextDocument::METHOD,
18761873
DidSaveTextDocumentParams {
1877-
text_document: TextDocumentIdentifier { uri: uri.clone() },
1874+
text_document: TextDocumentIdentifier { uri },
18781875
},
18791876
)?;
18801877

@@ -1887,7 +1884,7 @@ impl LanguageClient {
18871884
let filename = self.vim()?.get_filename(params)?;
18881885
let languageId = self.vim()?.get_languageId(&filename, params)?;
18891886

1890-
self.get_client(&Some(languageId.clone()))?.notify(
1887+
self.get_client(&Some(languageId))?.notify(
18911888
lsp::notification::DidCloseTextDocument::METHOD,
18921889
DidCloseTextDocumentParams {
18931890
text_document: TextDocumentIdentifier {
@@ -2571,7 +2568,7 @@ impl LanguageClient {
25712568
// already inserted.
25722569
//
25732570
// Check that we're not doing anything stupid before going ahead with this.
2574-
let mut edit = edit.clone();
2571+
let mut edit = edit;
25752572
edit.range.end.character =
25762573
edit.range.start.character + completed_item.word.len() as u64;
25772574
if edit.range.end != position || edit.range.start.line != edit.range.end.line {
@@ -2581,7 +2578,7 @@ impl LanguageClient {
25812578
};
25822579
}
25832580
if let Some(aedits) = lspitem.additional_text_edits {
2584-
edits.extend(aedits.clone());
2581+
edits.extend(aedits);
25852582
};
25862583

25872584
if edits.is_empty() {
@@ -3156,7 +3153,7 @@ impl LanguageClient {
31563153
let languageId = self.vim()?.get_languageId(&filename, params)?;
31573154

31583155
let params: DidChangeWatchedFilesParams = params.clone().to_lsp()?;
3159-
self.get_client(&Some(languageId.clone()))?
3156+
self.get_client(&Some(languageId))?
31603157
.notify(lsp::notification::DidChangeWatchedFiles::METHOD, params)?;
31613158

31623159
info!("End {}", lsp::notification::DidChangeWatchedFiles::METHOD);
@@ -3169,7 +3166,7 @@ impl LanguageClient {
31693166
let languageId = self.vim()?.get_languageId(&filename, params)?;
31703167

31713168
let content: String = self
3172-
.get_client(&Some(languageId.clone()))?
3169+
.get_client(&Some(languageId))?
31733170
.call(REQUEST__ClassFileContents, params)?;
31743171

31753172
let lines: Vec<String> = content

‎src/rpchandler.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl LanguageClient {
138138
let user_handler =
139139
self.get(|state| state.user_handlers.get(&notification.method).cloned())?;
140140
if let Some(user_handler) = user_handler {
141-
return self.vim()?.rpcclient.notify(&user_handler, params.clone());
141+
return self.vim()?.rpcclient.notify(&user_handler, params);
142142
}
143143

144144
match notification.method.as_str() {

‎src/types.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,11 +861,11 @@ pub trait VimExp {
861861

862862
impl<'a> VimExp for &'a str {
863863
fn to_key(&self) -> String {
864-
self.to_string()
864+
(*self).to_string()
865865
}
866866

867867
fn to_exp(&self) -> String {
868-
self.to_string()
868+
(*self).to_string()
869869
}
870870
}
871871

0 commit comments

Comments
 (0)