diff options
author | Alan Du <[email protected]> | 2018-10-20 17:29:25 +0100 |
---|---|---|
committer | Alan Du <[email protected]> | 2018-10-20 17:29:25 +0100 |
commit | 0857c22f263ff18418f939b57a7a2ab3f8aac2c1 (patch) | |
tree | f7a33b9fb8ddabe65c99f4db6a7d84c7a8463e16 /crates/ra_analysis/src | |
parent | 6dd3fa6a947a4442e46ac042ff955a7f17bd6a0f (diff) |
Revert "clippy: Fix new_ret_no_self"
This reverts commit 2ae9dfa812ccf18867373f77a106161378a6d91d.
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r-- | crates/ra_analysis/src/descriptors.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/job.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/descriptors.rs b/crates/ra_analysis/src/descriptors.rs index dced99b07..3fca3e581 100644 --- a/crates/ra_analysis/src/descriptors.rs +++ b/crates/ra_analysis/src/descriptors.rs | |||
@@ -232,7 +232,7 @@ pub struct FnDescriptor { | |||
232 | } | 232 | } |
233 | 233 | ||
234 | impl FnDescriptor { | 234 | impl FnDescriptor { |
235 | pub fn new_opt(node: ast::FnDef) -> Option<Self> { | 235 | pub fn new(node: ast::FnDef) -> Option<Self> { |
236 | let name = node.name()?.text().to_string(); | 236 | let name = node.name()?.text().to_string(); |
237 | 237 | ||
238 | // Strip the body out for the label. | 238 | // Strip the body out for the label. |
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index b4faf0b5b..2ed6694ba 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_opt(fn_def) { | 365 | if let Some(descriptor) = FnDescriptor::new(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 57215c862..2871f9839 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 | ||
13 | impl JobHandle { | 13 | impl JobHandle { |
14 | pub fn new_pair() -> (JobHandle, JobToken) { | 14 | pub fn new() -> (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 { |