aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-03-23 08:07:30 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-03-23 08:07:30 +0000
commit3d7a330f320ac2ebf73df012556d64be9b120445 (patch)
treeb96c4a3c4f1165fd394ce3a854dbe9e02d370a92 /crates/ra_hir/src/nameres.rs
parent15189bc7249fc68a1df0234721514b677a90a305 (diff)
parent4fd8cfd6adc554752a63aed9ed71d44b372ec4dc (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/nameres.rs')
-rw-r--r--crates/ra_hir/src/nameres.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index edd2f25f7..e9235bc59 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -296,7 +296,7 @@ impl CrateDefMap {
296 // plain import or absolute path in 2015: crate-relative with 296 // plain import or absolute path in 2015: crate-relative with
297 // fallback to extern prelude (with the simplification in 297 // fallback to extern prelude (with the simplification in
298 // rust-lang/rust#57745) 298 // rust-lang/rust#57745)
299 // TODO there must be a nicer way to write this condition 299 // FIXME there must be a nicer way to write this condition
300 PathKind::Plain | PathKind::Abs 300 PathKind::Plain | PathKind::Abs
301 if self.edition == Edition::Edition2015 301 if self.edition == Edition::Edition2015
302 && (path.kind == PathKind::Abs || mode == ResolveMode::Import) => 302 && (path.kind == PathKind::Abs || mode == ResolveMode::Import) =>