From 29fbc8e02180aac1f4d7819a9626206aa64028a0 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Tue, 11 Aug 2020 00:37:23 +0300
Subject: Move the DiagnosticsWithFix trait on the ide level

---
 crates/ra_hir/src/diagnostics.rs |  4 +---
 crates/ra_hir/src/semantics.rs   | 12 +++---------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'crates/ra_hir')

diff --git a/crates/ra_hir/src/diagnostics.rs b/crates/ra_hir/src/diagnostics.rs
index 564f6a5db..363164b9b 100644
--- a/crates/ra_hir/src/diagnostics.rs
+++ b/crates/ra_hir/src/diagnostics.rs
@@ -1,8 +1,6 @@
 //! FIXME: write short doc here
 pub use hir_def::diagnostics::UnresolvedModule;
-pub use hir_expand::diagnostics::{
-    Diagnostic, DiagnosticSink, DiagnosticSinkBuilder, DiagnosticWithFix,
-};
+pub use hir_expand::diagnostics::{Diagnostic, DiagnosticSink, DiagnosticSinkBuilder};
 pub use hir_ty::diagnostics::{
     MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, NoSuchField,
 };
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index c5bc2baff..e9f7a033c 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -8,7 +8,7 @@ use hir_def::{
     resolver::{self, HasResolver, Resolver},
     AsMacroCall, FunctionId, TraitId, VariantId,
 };
-use hir_expand::{diagnostics::DiagnosticWithFix, hygiene::Hygiene, name::AsName, ExpansionInfo};
+use hir_expand::{hygiene::Hygiene, name::AsName, ExpansionInfo};
 use hir_ty::associated_type_shorthand_candidates;
 use itertools::Itertools;
 use ra_db::{FileId, FileRange};
@@ -109,14 +109,8 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.parse(file_id)
     }
 
-    pub fn diagnostic_fix_source<T: DiagnosticWithFix + Diagnostic>(
-        &self,
-        d: &T,
-    ) -> Option<<T as DiagnosticWithFix>::AST> {
-        let file_id = d.presentation().file_id;
-        let root = self.db.parse_or_expand(file_id)?;
-        self.imp.cache(root, file_id);
-        d.fix_source(self.db.upcast())
+    pub fn cache(&self, root_node: SyntaxNode, file_id: HirFileId) {
+        self.imp.cache(root_node, file_id)
     }
 
     pub fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> {
-- 
cgit v1.2.3