aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src
diff options
context:
space:
mode:
authorAlan Du <[email protected]>2018-10-16 18:31:16 +0100
committerAlan Du <[email protected]>2018-10-18 00:42:23 +0100
commit2ae9dfa812ccf18867373f77a106161378a6d91d (patch)
treec3ff8017bfa41dd31de37de6716eb97db132ebcf /crates/ra_analysis/src
parent2268a2f8c6557301ecdcaeb4074331a0bd37dccd (diff)
clippy: Fix new_ret_no_self
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r--crates/ra_analysis/src/descriptors.rs2
-rw-r--r--crates/ra_analysis/src/imp.rs2
-rw-r--r--crates/ra_analysis/src/job.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/descriptors.rs b/crates/ra_analysis/src/descriptors.rs
index 6f26f9935..f64fcee16 100644
--- a/crates/ra_analysis/src/descriptors.rs
+++ b/crates/ra_analysis/src/descriptors.rs
@@ -233,7 +233,7 @@ pub struct FnDescriptor {
233} 233}
234 234
235impl FnDescriptor { 235impl FnDescriptor {
236 pub fn new(node: ast::FnDef) -> Option<Self> { 236 pub fn new_opt(node: ast::FnDef) -> Option<Self> {
237 let name = node.name()?.text().to_string(); 237 let name = node.name()?.text().to_string();
238 238
239 // Strip the body out for the label. 239 // Strip the body out for the label.
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 9b0d935af..1c16852b8 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -362,7 +362,7 @@ impl AnalysisImpl {
362 for (_, fs) in file_symbols { 362 for (_, fs) in file_symbols {
363 if fs.kind == FN_DEF { 363 if fs.kind == FN_DEF {
364 if let Some(fn_def) = find_node_at_offset(syntax, fs.node_range.start()) { 364 if let Some(fn_def) = find_node_at_offset(syntax, fs.node_range.start()) {
365 if let Some(descriptor) = FnDescriptor::new(fn_def) { 365 if let Some(descriptor) = FnDescriptor::new_opt(fn_def) {
366 // If we have a calling expression let's find which argument we are on 366 // If we have a calling expression let's find which argument we are on
367 let mut current_parameter = None; 367 let mut current_parameter = None;
368 368
diff --git a/crates/ra_analysis/src/job.rs b/crates/ra_analysis/src/job.rs
index 2871f9839..57215c862 100644
--- a/crates/ra_analysis/src/job.rs
+++ b/crates/ra_analysis/src/job.rs
@@ -11,7 +11,7 @@ pub struct JobToken {
11} 11}
12 12
13impl JobHandle { 13impl JobHandle {
14 pub fn new() -> (JobHandle, JobToken) { 14 pub fn new_pair() -> (JobHandle, JobToken) {
15 let (sender_alive, receiver_alive) = bounded(0); 15 let (sender_alive, receiver_alive) = bounded(0);
16 let (sender_canceled, receiver_canceled) = bounded(0); 16 let (sender_canceled, receiver_canceled) = bounded(0);
17 let token = JobToken { 17 let token = JobToken {