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]>

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 59af4ec60..f28154517 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -19,7 +19,7 @@ pub struct Resolver {
     scopes: Vec<Scope>,
 }
 
-// TODO how to store these best
+// FIXME how to store these best
 #[derive(Debug, Clone)]
 pub(crate) struct ModuleItemMap {
     crate_def_map: Arc<CrateDefMap>,
@@ -260,7 +260,7 @@ impl Scope {
     fn collect_names(&self, db: &impl HirDatabase, f: &mut dyn FnMut(Name, PerNs<Resolution>)) {
         match self {
             Scope::ModuleScope(m) => {
-                // TODO: should we provide `self` here?
+                // FIXME: should we provide `self` here?
                 // f(
                 //     Name::self_param(),
                 //     PerNs::types(Resolution::Def {