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/expr | |
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/expr')
-rw-r--r-- | crates/ra_hir/src/expr/scope.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs index 81fbc509e..ed005c9f7 100644 --- a/crates/ra_hir/src/expr/scope.rs +++ b/crates/ra_hir/src/expr/scope.rs | |||
@@ -39,7 +39,7 @@ pub struct ScopeData { | |||
39 | } | 39 | } |
40 | 40 | ||
41 | impl ExprScopes { | 41 | impl ExprScopes { |
42 | // TODO: This should take something more general than Function | 42 | // FIXME: This should take something more general than Function |
43 | pub(crate) fn expr_scopes_query(db: &impl HirDatabase, function: Function) -> Arc<ExprScopes> { | 43 | pub(crate) fn expr_scopes_query(db: &impl HirDatabase, function: Function) -> Arc<ExprScopes> { |
44 | let body = db.body_hir(function); | 44 | let body = db.body_hir(function); |
45 | let res = ExprScopes::new(body); | 45 | let res = ExprScopes::new(body); |
@@ -148,7 +148,7 @@ impl ScopesWithSourceMap { | |||
148 | 148 | ||
149 | // XXX: during completion, cursor might be outside of any particular | 149 | // XXX: during completion, cursor might be outside of any particular |
150 | // expression. Try to figure out the correct scope... | 150 | // expression. Try to figure out the correct scope... |
151 | // TODO: move this to source binder? | 151 | // FIXME: move this to source binder? |
152 | fn adjust(&self, ptr: SyntaxNodePtr, original_scope: ScopeId, offset: TextUnit) -> ScopeId { | 152 | fn adjust(&self, ptr: SyntaxNodePtr, original_scope: ScopeId, offset: TextUnit) -> ScopeId { |
153 | let r = ptr.range(); | 153 | let r = ptr.range(); |
154 | let child_scopes = self | 154 | let child_scopes = self |