diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 08:07:30 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 08:07:30 +0000 |
commit | 3d7a330f320ac2ebf73df012556d64be9b120445 (patch) | |
tree | b96c4a3c4f1165fd394ce3a854dbe9e02d370a92 /crates/ra_hir/src/path.rs | |
parent | 15189bc7249fc68a1df0234721514b677a90a305 (diff) | |
parent | 4fd8cfd6adc554752a63aed9ed71d44b372ec4dc (diff) |
Merge #990
990: Forbid TODO markers on master branch r=matklad a=matklad
this makes TODO markers useful for things which you want to fix before sending a PR
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/path.rs')
-rw-r--r-- | crates/ra_hir/src/path.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/path.rs b/crates/ra_hir/src/path.rs index 6ca373e34..6cc8104f4 100644 --- a/crates/ra_hir/src/path.rs +++ b/crates/ra_hir/src/path.rs | |||
@@ -96,7 +96,7 @@ impl Path { | |||
96 | if let Some(q) = path.qualifier() { | 96 | if let Some(q) = path.qualifier() { |
97 | return Some(q); | 97 | return Some(q); |
98 | } | 98 | } |
99 | // TODO: this bottom up traversal is not too precise. | 99 | // FIXME: this bottom up traversal is not too precise. |
100 | // Should we handle do a top-down analysis, recording results? | 100 | // Should we handle do a top-down analysis, recording results? |
101 | let use_tree_list = path.syntax().ancestors().find_map(ast::UseTreeList::cast)?; | 101 | let use_tree_list = path.syntax().ancestors().find_map(ast::UseTreeList::cast)?; |
102 | let use_tree = use_tree_list.parent_use_tree(); | 102 | let use_tree = use_tree_list.parent_use_tree(); |
@@ -166,7 +166,7 @@ fn expand_use_tree<'a>( | |||
166 | // or `use something::{path::{inner::{innerer}}}` (prefix is `something::path`, path is `inner`) | 166 | // or `use something::{path::{inner::{innerer}}}` (prefix is `something::path`, path is `inner`) |
167 | Some(path) => match convert_path(prefix, path) { | 167 | Some(path) => match convert_path(prefix, path) { |
168 | Some(it) => Some(it), | 168 | Some(it) => Some(it), |
169 | None => return, // TODO: report errors somewhere | 169 | None => return, // FIXME: report errors somewhere |
170 | }, | 170 | }, |
171 | }; | 171 | }; |
172 | for child_tree in use_tree_list.use_trees() { | 172 | for child_tree in use_tree_list.use_trees() { |
@@ -194,7 +194,7 @@ fn expand_use_tree<'a>( | |||
194 | cb(path, Some(segment), alias) | 194 | cb(path, Some(segment), alias) |
195 | }; | 195 | }; |
196 | } | 196 | } |
197 | // TODO: report errors somewhere | 197 | // FIXME: report errors somewhere |
198 | // We get here if we do | 198 | // We get here if we do |
199 | } | 199 | } |
200 | } | 200 | } |