aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_diagnostics/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ide_diagnostics/src')
-rw-r--r--crates/ide_diagnostics/src/incorrect_case.rs3
-rw-r--r--crates/ide_diagnostics/src/lib.rs5
-rw-r--r--crates/ide_diagnostics/src/missing_fields.rs3
-rw-r--r--crates/ide_diagnostics/src/missing_ok_or_some_in_tail_expr.rs3
-rw-r--r--crates/ide_diagnostics/src/unresolved_module.rs3
5 files changed, 6 insertions, 11 deletions
diff --git a/crates/ide_diagnostics/src/incorrect_case.rs b/crates/ide_diagnostics/src/incorrect_case.rs
index 04fc779ce..8e1a93aa7 100644
--- a/crates/ide_diagnostics/src/incorrect_case.rs
+++ b/crates/ide_diagnostics/src/incorrect_case.rs
@@ -1,6 +1,5 @@
1use hir::{db::AstDatabase, InFile}; 1use hir::{db::AstDatabase, InFile};
2use ide_assists::Assist; 2use ide_db::{assists::Assist, base_db::FilePosition};
3use ide_db::base_db::FilePosition;
4use syntax::AstNode; 3use syntax::AstNode;
5 4
6use crate::{ 5use crate::{
diff --git a/crates/ide_diagnostics/src/lib.rs b/crates/ide_diagnostics/src/lib.rs
index 0d98307a2..2a16c73a8 100644
--- a/crates/ide_diagnostics/src/lib.rs
+++ b/crates/ide_diagnostics/src/lib.rs
@@ -28,6 +28,7 @@ mod field_shorthand;
28 28
29use hir::{diagnostics::AnyDiagnostic, Semantics}; 29use hir::{diagnostics::AnyDiagnostic, Semantics};
30use ide_db::{ 30use ide_db::{
31 assists::{Assist, AssistId, AssistKind, AssistResolveStrategy},
31 base_db::{FileId, SourceDatabase}, 32 base_db::{FileId, SourceDatabase},
32 label::Label, 33 label::Label,
33 source_change::SourceChange, 34 source_change::SourceChange,
@@ -42,8 +43,6 @@ use syntax::{
42use text_edit::TextEdit; 43use text_edit::TextEdit;
43use unlinked_file::UnlinkedFile; 44use unlinked_file::UnlinkedFile;
44 45
45use ide_assists::{Assist, AssistId, AssistKind, AssistResolveStrategy};
46
47#[derive(Copy, Clone, Debug, PartialEq)] 46#[derive(Copy, Clone, Debug, PartialEq)]
48pub struct DiagnosticCode(pub &'static str); 47pub struct DiagnosticCode(pub &'static str);
49 48
@@ -265,8 +264,8 @@ fn unresolved_fix(id: &'static str, label: &str, target: TextRange) -> Assist {
265#[cfg(test)] 264#[cfg(test)]
266mod tests { 265mod tests {
267 use expect_test::Expect; 266 use expect_test::Expect;
268 use ide_assists::AssistResolveStrategy;
269 use ide_db::{ 267 use ide_db::{
268 assists::AssistResolveStrategy,
270 base_db::{fixture::WithFixture, SourceDatabaseExt}, 269 base_db::{fixture::WithFixture, SourceDatabaseExt},
271 RootDatabase, 270 RootDatabase,
272 }; 271 };
diff --git a/crates/ide_diagnostics/src/missing_fields.rs b/crates/ide_diagnostics/src/missing_fields.rs
index f242ee481..5af67f461 100644
--- a/crates/ide_diagnostics/src/missing_fields.rs
+++ b/crates/ide_diagnostics/src/missing_fields.rs
@@ -1,7 +1,6 @@
1use either::Either; 1use either::Either;
2use hir::{db::AstDatabase, InFile}; 2use hir::{db::AstDatabase, InFile};
3use ide_assists::Assist; 3use ide_db::{assists::Assist, source_change::SourceChange};
4use ide_db::source_change::SourceChange;
5use stdx::format_to; 4use stdx::format_to;
6use syntax::{algo, ast::make, AstNode, SyntaxNodePtr}; 5use syntax::{algo, ast::make, AstNode, SyntaxNodePtr};
7use text_edit::TextEdit; 6use text_edit::TextEdit;
diff --git a/crates/ide_diagnostics/src/missing_ok_or_some_in_tail_expr.rs b/crates/ide_diagnostics/src/missing_ok_or_some_in_tail_expr.rs
index 9e36ca296..01c79b6f5 100644
--- a/crates/ide_diagnostics/src/missing_ok_or_some_in_tail_expr.rs
+++ b/crates/ide_diagnostics/src/missing_ok_or_some_in_tail_expr.rs
@@ -1,6 +1,5 @@
1use hir::db::AstDatabase; 1use hir::db::AstDatabase;
2use ide_assists::Assist; 2use ide_db::{assists::Assist, source_change::SourceChange};
3use ide_db::source_change::SourceChange;
4use syntax::AstNode; 3use syntax::AstNode;
5use text_edit::TextEdit; 4use text_edit::TextEdit;
6 5
diff --git a/crates/ide_diagnostics/src/unresolved_module.rs b/crates/ide_diagnostics/src/unresolved_module.rs
index b11e71b3e..5aa9dae17 100644
--- a/crates/ide_diagnostics/src/unresolved_module.rs
+++ b/crates/ide_diagnostics/src/unresolved_module.rs
@@ -1,6 +1,5 @@
1use hir::db::AstDatabase; 1use hir::db::AstDatabase;
2use ide_assists::Assist; 2use ide_db::{assists::Assist, base_db::AnchoredPathBuf, source_change::FileSystemEdit};
3use ide_db::{base_db::AnchoredPathBuf, source_change::FileSystemEdit};
4use syntax::AstNode; 3use syntax::AstNode;
5 4
6use crate::{fix, Diagnostic, DiagnosticsContext}; 5use crate::{fix, Diagnostic, DiagnosticsContext};