diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-14 09:30:07 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-14 09:30:07 +0100 |
commit | 612112a2c26ec61bf341f99e9e7753bb41873fc4 (patch) | |
tree | c2becab63418e6ffd88af4bfdd1b129b305cff6d /crates/ra_hir_ty/src/test_db.rs | |
parent | a34f79b17412f83242283fae6e7a6275b4056611 (diff) | |
parent | 19450534cf308eff30ea7de1a40ab77dca4e6014 (diff) |
Merge #5358
5358: Cleanup hir diagnostics API r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/test_db.rs')
-rw-r--r-- | crates/ra_hir_ty/src/test_db.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs index dc447955f..daf2b909e 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/ra_hir_ty/src/test_db.rs | |||
@@ -13,10 +13,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; | |||
13 | use stdx::format_to; | 13 | use stdx::format_to; |
14 | use test_utils::extract_annotations; | 14 | use test_utils::extract_annotations; |
15 | 15 | ||
16 | use crate::{ | 16 | use crate::diagnostics::{validate_body, Diagnostic}; |
17 | db::HirDatabase, diagnostics::Diagnostic, expr::ExprValidator, | ||
18 | unsafe_validation::UnsafeValidator, | ||
19 | }; | ||
20 | 17 | ||
21 | #[salsa::database( | 18 | #[salsa::database( |
22 | ra_db::SourceDatabaseExtStorage, | 19 | ra_db::SourceDatabaseExtStorage, |
@@ -118,13 +115,8 @@ impl TestDB { | |||
118 | } | 115 | } |
119 | 116 | ||
120 | for f in fns { | 117 | for f in fns { |
121 | let infer = self.infer(f.into()); | ||
122 | let mut sink = DiagnosticSink::new(&mut cb); | 118 | let mut sink = DiagnosticSink::new(&mut cb); |
123 | infer.add_diagnostics(self, f, &mut sink); | 119 | validate_body(self, f.into(), &mut sink); |
124 | let mut validator = ExprValidator::new(f, infer.clone(), &mut sink); | ||
125 | validator.validate_body(self); | ||
126 | let mut validator = UnsafeValidator::new(f, infer, &mut sink); | ||
127 | validator.validate_body(self); | ||
128 | } | 120 | } |
129 | } | 121 | } |
130 | } | 122 | } |