aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-08-12 17:31:42 +0100
committerGitHub <[email protected]>2020-08-12 17:31:42 +0100
commitd583f2c46d22cf8d643ebf98be9cb7059a304431 (patch)
tree9d898eb9600b0c36a74e4f95238f679c683fa566 /crates/ra_hir_ty
parent3d6889cba72a9d02199f7adaa2ecc69bc30af834 (diff)
parenta1c187eef3ba08076aedb5154929f7eda8d1b424 (diff)
Merge #5729
5729: Rename ra_syntax -> syntax r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty')
-rw-r--r--crates/ra_hir_ty/Cargo.toml2
-rw-r--r--crates/ra_hir_ty/src/diagnostics.rs4
-rw-r--r--crates/ra_hir_ty/src/diagnostics/expr.rs2
-rw-r--r--crates/ra_hir_ty/src/infer.rs2
-rw-r--r--crates/ra_hir_ty/src/infer/expr.rs2
-rw-r--r--crates/ra_hir_ty/src/test_db.rs2
-rw-r--r--crates/ra_hir_ty/src/tests.rs4
-rw-r--r--crates/ra_hir_ty/src/tests/macros.rs2
8 files changed, 10 insertions, 10 deletions
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 380d5e601..6156e4a85 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -23,7 +23,7 @@ hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
23arena = { path = "../arena" } 23arena = { path = "../arena" }
24ra_db = { path = "../ra_db" } 24ra_db = { path = "../ra_db" }
25profile = { path = "../profile" } 25profile = { path = "../profile" }
26ra_syntax = { path = "../ra_syntax" } 26syntax = { path = "../syntax" }
27test_utils = { path = "../test_utils" } 27test_utils = { path = "../test_utils" }
28 28
29scoped-tls = "1" 29scoped-tls = "1"
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index 55c02c1fe..bf35d2d0e 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -8,8 +8,8 @@ use std::any::Any;
8use hir_def::DefWithBodyId; 8use hir_def::DefWithBodyId;
9use hir_expand::diagnostics::{Diagnostic, DiagnosticSink}; 9use hir_expand::diagnostics::{Diagnostic, DiagnosticSink};
10use hir_expand::{name::Name, HirFileId, InFile}; 10use hir_expand::{name::Name, HirFileId, InFile};
11use ra_syntax::{ast, AstPtr, SyntaxNodePtr};
12use stdx::format_to; 11use stdx::format_to;
12use syntax::{ast, AstPtr, SyntaxNodePtr};
13 13
14use crate::db::HirDatabase; 14use crate::db::HirDatabase;
15 15
@@ -214,8 +214,8 @@ mod tests {
214 diagnostics::{Diagnostic, DiagnosticSinkBuilder}, 214 diagnostics::{Diagnostic, DiagnosticSinkBuilder},
215 }; 215 };
216 use ra_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt}; 216 use ra_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt};
217 use ra_syntax::{TextRange, TextSize};
218 use rustc_hash::FxHashMap; 217 use rustc_hash::FxHashMap;
218 use syntax::{TextRange, TextSize};
219 219
220 use crate::{diagnostics::validate_body, test_db::TestDB}; 220 use crate::{diagnostics::validate_body, test_db::TestDB};
221 221
diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs
index 51adcecaf..fb76e2e4e 100644
--- a/crates/ra_hir_ty/src/diagnostics/expr.rs
+++ b/crates/ra_hir_ty/src/diagnostics/expr.rs
@@ -4,8 +4,8 @@ use std::sync::Arc;
4 4
5use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId}; 5use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId};
6use hir_expand::diagnostics::DiagnosticSink; 6use hir_expand::diagnostics::DiagnosticSink;
7use ra_syntax::{ast, AstPtr};
8use rustc_hash::FxHashSet; 7use rustc_hash::FxHashSet;
8use syntax::{ast, AstPtr};
9 9
10use crate::{ 10use crate::{
11 db::HirDatabase, 11 db::HirDatabase,
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 784ae1c3c..03b00b101 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -31,9 +31,9 @@ use hir_def::{
31 TypeAliasId, VariantId, 31 TypeAliasId, VariantId,
32}; 32};
33use hir_expand::{diagnostics::DiagnosticSink, name::name}; 33use hir_expand::{diagnostics::DiagnosticSink, name::name};
34use ra_syntax::SmolStr;
35use rustc_hash::FxHashMap; 34use rustc_hash::FxHashMap;
36use stdx::impl_from; 35use stdx::impl_from;
36use syntax::SmolStr;
37 37
38use super::{ 38use super::{
39 primitive::{FloatTy, IntTy}, 39 primitive::{FloatTy, IntTy},
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs
index 731b062c2..a2f849d02 100644
--- a/crates/ra_hir_ty/src/infer/expr.rs
+++ b/crates/ra_hir_ty/src/infer/expr.rs
@@ -11,7 +11,7 @@ use hir_def::{
11 AdtId, AssocContainerId, FieldId, Lookup, 11 AdtId, AssocContainerId, FieldId, Lookup,
12}; 12};
13use hir_expand::name::{name, Name}; 13use hir_expand::name::{name, Name};
14use ra_syntax::ast::RangeOp; 14use syntax::ast::RangeOp;
15 15
16use crate::{ 16use crate::{
17 autoderef, method_resolution, op, 17 autoderef, method_resolution, op,
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index a1714ff0f..0e2a69eec 100644
--- a/crates/ra_hir_ty/src/test_db.rs
+++ b/crates/ra_hir_ty/src/test_db.rs
@@ -8,8 +8,8 @@ use std::{
8use hir_def::{db::DefDatabase, ModuleId}; 8use hir_def::{db::DefDatabase, ModuleId};
9use hir_expand::db::AstDatabase; 9use hir_expand::db::AstDatabase;
10use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast}; 10use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast};
11use ra_syntax::TextRange;
12use rustc_hash::{FxHashMap, FxHashSet}; 11use rustc_hash::{FxHashMap, FxHashSet};
12use syntax::TextRange;
13use test_utils::extract_annotations; 13use test_utils::extract_annotations;
14 14
15#[salsa::database( 15#[salsa::database(
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 016e689ff..5f6f8869a 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -22,12 +22,12 @@ use hir_def::{
22}; 22};
23use hir_expand::{db::AstDatabase, InFile}; 23use hir_expand::{db::AstDatabase, InFile};
24use ra_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt}; 24use ra_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt};
25use ra_syntax::{ 25use stdx::format_to;
26use syntax::{
26 algo, 27 algo,
27 ast::{self, AstNode}, 28 ast::{self, AstNode},
28 SyntaxNode, 29 SyntaxNode,
29}; 30};
30use stdx::format_to;
31 31
32use crate::{ 32use crate::{
33 db::HirDatabase, display::HirDisplay, infer::TypeMismatch, test_db::TestDB, InferenceResult, Ty, 33 db::HirDatabase, display::HirDisplay, infer::TypeMismatch, test_db::TestDB, InferenceResult, Ty,
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index 24c53eb02..d887c7a79 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -543,7 +543,7 @@ fn bar() -> u32 {0}
543#[test] 543#[test]
544#[ignore] 544#[ignore]
545fn include_accidentally_quadratic() { 545fn include_accidentally_quadratic() {
546 let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic"); 546 let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic");
547 let big_file = fs::read_to_string(file).unwrap(); 547 let big_file = fs::read_to_string(file).unwrap();
548 let big_file = vec![big_file; 10].join("\n"); 548 let big_file = vec![big_file; 10].join("\n");
549 549