diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-04 13:52:47 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-04 13:52:47 +0000 |
commit | 821fa7a50ab8c4886adc60a2093aa8e06cc3a9d6 (patch) | |
tree | 6b23591e5a58341ff7696d8e3f90ecdf4c30ca2c /crates/ra_analysis | |
parent | 6295bbe6ec9741538307cd619ada1c9566f99a5d (diff) | |
parent | a0ef196d0404cf89367928f347dd515ba31d081b (diff) |
Merge #424
424: remove non-doc comments from doc comments r=matklad a=csmoe
Closes #357
Co-authored-by: csmoe <[email protected]>
Diffstat (limited to 'crates/ra_analysis')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/tests/test/main.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index ab935954c..1e26a2889 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -394,7 +394,7 @@ impl Analysis { | |||
394 | pub fn doc_text_for(&self, nav: NavigationTarget) -> Cancelable<Option<String>> { | 394 | pub fn doc_text_for(&self, nav: NavigationTarget) -> Cancelable<Option<String>> { |
395 | self.db.doc_text_for(nav) | 395 | self.db.doc_text_for(nav) |
396 | } | 396 | } |
397 | /// Returns a `mod name;` declaration whihc created the current module. | 397 | /// Returns a `mod name;` declaration which created the current module. |
398 | pub fn parent_module(&self, position: FilePosition) -> Cancelable<Vec<NavigationTarget>> { | 398 | pub fn parent_module(&self, position: FilePosition) -> Cancelable<Vec<NavigationTarget>> { |
399 | self.db.parent_module(position) | 399 | self.db.parent_module(position) |
400 | } | 400 | } |
diff --git a/crates/ra_analysis/tests/test/main.rs b/crates/ra_analysis/tests/test/main.rs index bfdf8aef2..859778024 100644 --- a/crates/ra_analysis/tests/test/main.rs +++ b/crates/ra_analysis/tests/test/main.rs | |||
@@ -249,7 +249,8 @@ fn bar() { | |||
249 | fn test_fn_signature_with_docs_simple() { | 249 | fn test_fn_signature_with_docs_simple() { |
250 | let (desc, param) = get_signature( | 250 | let (desc, param) = get_signature( |
251 | r#" | 251 | r#" |
252 | // test | 252 | /// test |
253 | // non-doc-comment | ||
253 | fn foo(j: u32) -> u32 { | 254 | fn foo(j: u32) -> u32 { |
254 | j | 255 | j |
255 | } | 256 | } |