5 files changed, 27 insertions, 21 deletions

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 5766cc3b8..839eb475e 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -192,11 +192,11 @@ impl ModuleDef {
             ModuleDef::Function(m) => Some(m.name(db)),
             ModuleDef::Adt(m) => Some(m.name(db)),
             ModuleDef::EnumVariant(m) => Some(m.name(db)),
-            ModuleDef::Const(m) => {m.name(db)},
-            ModuleDef::Static(m) => {m.name(db)},
-            ModuleDef::Trait(m) => {Some(m.name(db))},
-            ModuleDef::TypeAlias(m) => {Some(m.name(db))},
-            ModuleDef::BuiltinType(m) => {Some(m.as_name())}
+            ModuleDef::Const(m) => m.name(db),
+            ModuleDef::Static(m) => m.name(db),
+            ModuleDef::Trait(m) => Some(m.name(db)),
+            ModuleDef::TypeAlias(m) => Some(m.name(db)),
+            ModuleDef::BuiltinType(m) => Some(m.as_name()),
         }
     }
 
@@ -205,13 +205,17 @@ impl ModuleDef {
             ModuleDef::Module(m) => Into::<ModuleId>::into(m.clone()).resolver(db),
             ModuleDef::Function(f) => Into::<FunctionId>::into(f.clone()).resolver(db),
             ModuleDef::Adt(adt) => Into::<AdtId>::into(adt.clone()).resolver(db),
-            ModuleDef::EnumVariant(ev) => Into::<GenericDefId>::into(Into::<GenericDef>::into(ev.clone())).resolver(db),
-            ModuleDef::Const(c) => Into::<GenericDefId>::into(Into::<GenericDef>::into(c.clone())).resolver(db),
+            ModuleDef::EnumVariant(ev) => {
+                Into::<GenericDefId>::into(Into::<GenericDef>::into(ev.clone())).resolver(db)
+            }
+            ModuleDef::Const(c) => {
+                Into::<GenericDefId>::into(Into::<GenericDef>::into(c.clone())).resolver(db)
+            }
             ModuleDef::Static(s) => Into::<StaticId>::into(s.clone()).resolver(db),
             ModuleDef::Trait(t) => Into::<TraitId>::into(t.clone()).resolver(db),
             ModuleDef::TypeAlias(t) => Into::<ModuleId>::into(t.module(db)).resolver(db),
-            // TODO: This should be a resolver relative to `std`
-            ModuleDef::BuiltinType(_t) => None?
+            // FIXME: This should be a resolver relative to `std/core`
+            ModuleDef::BuiltinType(_t) => None?,
         })
     }
 }
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index 9f8ab4795..185139250 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -540,14 +540,14 @@ fn try_resolve_intra(
 
     let resolved = resolver.resolve_module_path_in_items(db, &modpath);
     let (defid, namespace) = match namespace {
-        // TODO: .or(resolved.macros)
+        // FIXME: .or(resolved.macros)
         None => resolved
             .types
             .map(|t| (t.0, Namespace::Types))
             .or(resolved.values.map(|t| (t.0, Namespace::Values)))?,
         Some(ns @ Namespace::Types) => (resolved.types?.0, ns),
         Some(ns @ Namespace::Values) => (resolved.values?.0, ns),
-        // TODO:
+        // FIXME:
         Some(Namespace::Macros) => None?,
     };
 
@@ -558,7 +558,7 @@ fn try_resolve_intra(
     let ns = match namespace {
         Namespace::Types => ItemInNs::Types(defid),
         Namespace::Values => ItemInNs::Values(defid),
-        // TODO:
+        // FIXME:
         Namespace::Macros => None?,
     };
     let import_map = db.import_map(krate.into());
@@ -603,7 +603,7 @@ fn try_resolve_path(db: &RootDatabase, definition: &Definition, link: &str) -> O
 }
 
 /// Try to get the root URL of the documentation of a crate.
-// TODO: Special case standard, core, alloc libraries
+// FIXME: Special case standard, core, alloc libraries
 fn get_doc_url(db: &RootDatabase, krate: &Crate) -> Option<Url> {
     // Look for #![doc(html_root_url = "...")]
     let attrs = db.attrs(AttrDef::from(krate.root_module(db)?).into());
@@ -621,7 +621,7 @@ fn get_doc_url(db: &RootDatabase, krate: &Crate) -> Option<Url> {
         }).next()
     } else {
         // Fallback to docs.rs
-        // TODO: Specify an exact version here (from Cargo.lock)
+        // FIXME: Specify an exact version here (from Cargo.lock)
         Some(format!("https://docs.rs/{}/*", krate.display_name(db)?))
     };
 
@@ -648,7 +648,6 @@ fn get_symbol_filename(db: &RootDatabase, definition: &Definition) -> Option<Str
                 format!("enum.{}.html#variant.{}", ev.parent_enum(db).name(db), ev.name(db))
             }
             ModuleDef::Const(c) => format!("const.{}.html", c.name(db)?),
-            // TODO: Check this is the right prefix
             ModuleDef::Static(s) => format!("static.{}.html", s.name(db)?),
         },
         Definition::Macro(m) => format!("macro.{}.html", m.name(db)?),
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index a158169e3..b07395a64 100644
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -6,8 +6,9 @@
 // FIXME: this badly needs rename/rewrite (matklad, 2020-02-06).
 
 use hir::{
+    db::{DefDatabase, HirDatabase},
     Field, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, Name, PathResolution,
-    Semantics, TypeParam, Visibility, db::{DefDatabase, HirDatabase},
+    Semantics, TypeParam, Visibility,
 };
 use ra_prof::profile;
 use ra_syntax::{
@@ -16,7 +17,7 @@ use ra_syntax::{
 };
 
 use crate::RootDatabase;
-use ra_hir_def::resolver::{Resolver, HasResolver};
+use ra_hir_def::resolver::{HasResolver, Resolver};
 
 // FIXME: a more precise name would probably be `Symbol`?
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
@@ -83,12 +84,14 @@ impl Definition {
         use ra_hir_def::*;
         Some(match self {
             Definition::ModuleDef(def) => def.resolver(db)?,
-            Definition::Field(field) => Into::<VariantId>::into(Into::<VariantDef>::into(field.parent_def(db))).resolver(db),
+            Definition::Field(field) => {
+                Into::<VariantId>::into(Into::<VariantDef>::into(field.parent_def(db))).resolver(db)
+            }
             Definition::Macro(m) => Into::<ModuleId>::into(m.module(db)?).resolver(db),
             Definition::SelfType(imp) => Into::<ImplId>::into(imp.clone()).resolver(db),
             // it's possible, read probable, that other arms of this are also unreachable
             Definition::Local(_local) => unreachable!(),
-            Definition::TypeParam(tp) => Into::<ModuleId>::into(tp.module(db)).resolver(db)
+            Definition::TypeParam(tp) => Into::<ModuleId>::into(tp.module(db)).resolver(db),
         })
     }
 }
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 7a2c44cd2..bd83eb2d2 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -47,7 +47,7 @@ use crate::syntax_node::GreenNode;
 pub use crate::{
     algo::InsertPosition,
     ast::{AstNode, AstToken},
-    parsing::{lex_single_syntax_kind, lex_single_valid_syntax_kind, tokenize, Token, parse_text},
+    parsing::{lex_single_syntax_kind, lex_single_valid_syntax_kind, parse_text, tokenize, Token},
     ptr::{AstPtr, SyntaxNodePtr},
     syntax_error::SyntaxError,
     syntax_node::{
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index c8c8b886d..e35a5e846 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -4,7 +4,7 @@
 
 use std::{
     io::Write as _,
-    process::{self, Stdio}
+    process::{self, Stdio},
 };
 
 use lsp_server::ErrorCode;