diff options
author | Aleksey Kladov <[email protected]> | 2020-08-13 15:35:29 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-08-13 15:35:29 +0100 |
commit | 6a77ec7bbe6ddbf663dce9529d11d1bb56c5489a (patch) | |
tree | b6e3d7e0109eb82bca75b5ebc35a7d723542b8dd | |
parent | 50f8c1ebf23f634b68529603a917e3feeda457fa (diff) |
Rename ra_hir_ty -> hir_ty
-rw-r--r-- | Cargo.lock | 60 | ||||
-rw-r--r-- | crates/hir_ty/Cargo.toml (renamed from crates/ra_hir_ty/Cargo.toml) | 23 | ||||
-rw-r--r-- | crates/hir_ty/src/autoderef.rs (renamed from crates/ra_hir_ty/src/autoderef.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/db.rs (renamed from crates/ra_hir_ty/src/db.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics.rs (renamed from crates/ra_hir_ty/src/diagnostics.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics/expr.rs (renamed from crates/ra_hir_ty/src/diagnostics/expr.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics/match_check.rs (renamed from crates/ra_hir_ty/src/diagnostics/match_check.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics/unsafe_check.rs (renamed from crates/ra_hir_ty/src/diagnostics/unsafe_check.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/display.rs (renamed from crates/ra_hir_ty/src/display.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer.rs (renamed from crates/ra_hir_ty/src/infer.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/coerce.rs (renamed from crates/ra_hir_ty/src/infer/coerce.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/expr.rs (renamed from crates/ra_hir_ty/src/infer/expr.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/pat.rs (renamed from crates/ra_hir_ty/src/infer/pat.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/path.rs (renamed from crates/ra_hir_ty/src/infer/path.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/unify.rs (renamed from crates/ra_hir_ty/src/infer/unify.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/lib.rs (renamed from crates/ra_hir_ty/src/lib.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/lower.rs (renamed from crates/ra_hir_ty/src/lower.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/method_resolution.rs (renamed from crates/ra_hir_ty/src/method_resolution.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/op.rs (renamed from crates/ra_hir_ty/src/op.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/primitive.rs (renamed from crates/ra_hir_ty/src/primitive.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/test_db.rs (renamed from crates/ra_hir_ty/src/test_db.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests.rs (renamed from crates/ra_hir_ty/src/tests.rs) | 2 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/coercion.rs (renamed from crates/ra_hir_ty/src/tests/coercion.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/display_source_code.rs (renamed from crates/ra_hir_ty/src/tests/display_source_code.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/macros.rs (renamed from crates/ra_hir_ty/src/tests/macros.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/method_resolution.rs (renamed from crates/ra_hir_ty/src/tests/method_resolution.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/never_type.rs (renamed from crates/ra_hir_ty/src/tests/never_type.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/patterns.rs (renamed from crates/ra_hir_ty/src/tests/patterns.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/regression.rs (renamed from crates/ra_hir_ty/src/tests/regression.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/simple.rs (renamed from crates/ra_hir_ty/src/tests/simple.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/tests/traits.rs (renamed from crates/ra_hir_ty/src/tests/traits.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/traits.rs (renamed from crates/ra_hir_ty/src/traits.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk.rs (renamed from crates/ra_hir_ty/src/traits/chalk.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk/interner.rs (renamed from crates/ra_hir_ty/src/traits/chalk/interner.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk/mapping.rs (renamed from crates/ra_hir_ty/src/traits/chalk/mapping.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk/tls.rs (renamed from crates/ra_hir_ty/src/traits/chalk/tls.rs) | 0 | ||||
-rw-r--r-- | crates/hir_ty/src/utils.rs (renamed from crates/ra_hir_ty/src/utils.rs) | 0 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
-rw-r--r-- | xtask/tests/tidy.rs | 2 |
40 files changed, 44 insertions, 47 deletions
diff --git a/Cargo.lock b/Cargo.lock index 702bd5191..6ecea3647 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -508,6 +508,34 @@ dependencies = [ | |||
508 | ] | 508 | ] |
509 | 509 | ||
510 | [[package]] | 510 | [[package]] |
511 | name = "hir_ty" | ||
512 | version = "0.0.0" | ||
513 | dependencies = [ | ||
514 | "arena", | ||
515 | "arrayvec", | ||
516 | "base_db", | ||
517 | "chalk-ir", | ||
518 | "chalk-recursive", | ||
519 | "chalk-solve", | ||
520 | "ena", | ||
521 | "expect", | ||
522 | "hir_def", | ||
523 | "hir_expand", | ||
524 | "itertools", | ||
525 | "log", | ||
526 | "profile", | ||
527 | "rustc-hash", | ||
528 | "scoped-tls", | ||
529 | "smallvec", | ||
530 | "stdx", | ||
531 | "syntax", | ||
532 | "test_utils", | ||
533 | "tracing", | ||
534 | "tracing-subscriber", | ||
535 | "tracing-tree", | ||
536 | ] | ||
537 | |||
538 | [[package]] | ||
511 | name = "home" | 539 | name = "home" |
512 | version = "0.5.3" | 540 | version = "0.5.3" |
513 | source = "registry+https://github.com/rust-lang/crates.io-index" | 541 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1063,44 +1091,16 @@ dependencies = [ | |||
1063 | "either", | 1091 | "either", |
1064 | "hir_def", | 1092 | "hir_def", |
1065 | "hir_expand", | 1093 | "hir_expand", |
1094 | "hir_ty", | ||
1066 | "itertools", | 1095 | "itertools", |
1067 | "log", | 1096 | "log", |
1068 | "profile", | 1097 | "profile", |
1069 | "ra_hir_ty", | ||
1070 | "rustc-hash", | 1098 | "rustc-hash", |
1071 | "stdx", | 1099 | "stdx", |
1072 | "syntax", | 1100 | "syntax", |
1073 | ] | 1101 | ] |
1074 | 1102 | ||
1075 | [[package]] | 1103 | [[package]] |
1076 | name = "ra_hir_ty" | ||
1077 | version = "0.1.0" | ||
1078 | dependencies = [ | ||
1079 | "arena", | ||
1080 | "arrayvec", | ||
1081 | "base_db", | ||
1082 | "chalk-ir", | ||
1083 | "chalk-recursive", | ||
1084 | "chalk-solve", | ||
1085 | "ena", | ||
1086 | "expect", | ||
1087 | "hir_def", | ||
1088 | "hir_expand", | ||
1089 | "itertools", | ||
1090 | "log", | ||
1091 | "profile", | ||
1092 | "rustc-hash", | ||
1093 | "scoped-tls", | ||
1094 | "smallvec", | ||
1095 | "stdx", | ||
1096 | "syntax", | ||
1097 | "test_utils", | ||
1098 | "tracing", | ||
1099 | "tracing-subscriber", | ||
1100 | "tracing-tree", | ||
1101 | ] | ||
1102 | |||
1103 | [[package]] | ||
1104 | name = "ra_ide" | 1104 | name = "ra_ide" |
1105 | version = "0.1.0" | 1105 | version = "0.1.0" |
1106 | dependencies = [ | 1106 | dependencies = [ |
@@ -1237,6 +1237,7 @@ dependencies = [ | |||
1237 | "expect", | 1237 | "expect", |
1238 | "flycheck", | 1238 | "flycheck", |
1239 | "hir_def", | 1239 | "hir_def", |
1240 | "hir_ty", | ||
1240 | "itertools", | 1241 | "itertools", |
1241 | "jod-thread", | 1242 | "jod-thread", |
1242 | "log", | 1243 | "log", |
@@ -1251,7 +1252,6 @@ dependencies = [ | |||
1251 | "profile", | 1252 | "profile", |
1252 | "project_model", | 1253 | "project_model", |
1253 | "ra_hir", | 1254 | "ra_hir", |
1254 | "ra_hir_ty", | ||
1255 | "ra_ide", | 1255 | "ra_ide", |
1256 | "ra_ide_db", | 1256 | "ra_ide_db", |
1257 | "ra_ssr", | 1257 | "ra_ssr", |
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index d430b08ca..83b5013a9 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml | |||
@@ -1,9 +1,9 @@ | |||
1 | [package] | 1 | [package] |
2 | edition = "2018" | 2 | name = "hir_ty" |
3 | name = "ra_hir_ty" | 3 | version = "0.0.0" |
4 | version = "0.1.0" | ||
5 | authors = ["rust-analyzer developers"] | ||
6 | license = "MIT OR Apache-2.0" | 4 | license = "MIT OR Apache-2.0" |
5 | authors = ["rust-analyzer developers"] | ||
6 | edition = "2018" | ||
7 | 7 | ||
8 | [lib] | 8 | [lib] |
9 | doctest = false | 9 | doctest = false |
@@ -15,9 +15,12 @@ smallvec = "1.2.0" | |||
15 | ena = "0.14.0" | 15 | ena = "0.14.0" |
16 | log = "0.4.8" | 16 | log = "0.4.8" |
17 | rustc-hash = "1.1.0" | 17 | rustc-hash = "1.1.0" |
18 | scoped-tls = "1" | ||
19 | chalk-solve = { version = "0.21.0" } | ||
20 | chalk-ir = { version = "0.21.0" } | ||
21 | chalk-recursive = { version = "0.21.0" } | ||
18 | 22 | ||
19 | stdx = { path = "../stdx" } | 23 | stdx = { path = "../stdx" } |
20 | |||
21 | hir_def = { path = "../hir_def" } | 24 | hir_def = { path = "../hir_def" } |
22 | hir_expand = { path = "../hir_expand" } | 25 | hir_expand = { path = "../hir_expand" } |
23 | arena = { path = "../arena" } | 26 | arena = { path = "../arena" } |
@@ -26,15 +29,9 @@ profile = { path = "../profile" } | |||
26 | syntax = { path = "../syntax" } | 29 | syntax = { path = "../syntax" } |
27 | test_utils = { path = "../test_utils" } | 30 | test_utils = { path = "../test_utils" } |
28 | 31 | ||
29 | scoped-tls = "1" | ||
30 | |||
31 | chalk-solve = { version = "0.21.0" } | ||
32 | chalk-ir = { version = "0.21.0" } | ||
33 | chalk-recursive = { version = "0.21.0" } | ||
34 | |||
35 | [dev-dependencies] | 32 | [dev-dependencies] |
36 | expect = { path = "../expect" } | ||
37 | |||
38 | tracing = "0.1" | 33 | tracing = "0.1" |
39 | tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] } | 34 | tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] } |
40 | tracing-tree = { version = "0.1.4" } | 35 | tracing-tree = { version = "0.1.4" } |
36 | |||
37 | expect = { path = "../expect" } | ||
diff --git a/crates/ra_hir_ty/src/autoderef.rs b/crates/hir_ty/src/autoderef.rs index ece68183e..ece68183e 100644 --- a/crates/ra_hir_ty/src/autoderef.rs +++ b/crates/hir_ty/src/autoderef.rs | |||
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/hir_ty/src/db.rs index 25cf9eb7f..25cf9eb7f 100644 --- a/crates/ra_hir_ty/src/db.rs +++ b/crates/hir_ty/src/db.rs | |||
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/hir_ty/src/diagnostics.rs index ae0cf8d09..ae0cf8d09 100644 --- a/crates/ra_hir_ty/src/diagnostics.rs +++ b/crates/hir_ty/src/diagnostics.rs | |||
diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs b/crates/hir_ty/src/diagnostics/expr.rs index fb76e2e4e..fb76e2e4e 100644 --- a/crates/ra_hir_ty/src/diagnostics/expr.rs +++ b/crates/hir_ty/src/diagnostics/expr.rs | |||
diff --git a/crates/ra_hir_ty/src/diagnostics/match_check.rs b/crates/hir_ty/src/diagnostics/match_check.rs index 7f007f1d6..7f007f1d6 100644 --- a/crates/ra_hir_ty/src/diagnostics/match_check.rs +++ b/crates/hir_ty/src/diagnostics/match_check.rs | |||
diff --git a/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs b/crates/hir_ty/src/diagnostics/unsafe_check.rs index 61ffbf5d1..61ffbf5d1 100644 --- a/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs +++ b/crates/hir_ty/src/diagnostics/unsafe_check.rs | |||
diff --git a/crates/ra_hir_ty/src/display.rs b/crates/hir_ty/src/display.rs index 19770e609..19770e609 100644 --- a/crates/ra_hir_ty/src/display.rs +++ b/crates/hir_ty/src/display.rs | |||
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs index 03b00b101..03b00b101 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/hir_ty/src/infer.rs | |||
diff --git a/crates/ra_hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs index 32c7c57cd..32c7c57cd 100644 --- a/crates/ra_hir_ty/src/infer/coerce.rs +++ b/crates/hir_ty/src/infer/coerce.rs | |||
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index a2f849d02..a2f849d02 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
diff --git a/crates/ra_hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs index 4dd4f9802..4dd4f9802 100644 --- a/crates/ra_hir_ty/src/infer/pat.rs +++ b/crates/hir_ty/src/infer/pat.rs | |||
diff --git a/crates/ra_hir_ty/src/infer/path.rs b/crates/hir_ty/src/infer/path.rs index 80d7ed10e..80d7ed10e 100644 --- a/crates/ra_hir_ty/src/infer/path.rs +++ b/crates/hir_ty/src/infer/path.rs | |||
diff --git a/crates/ra_hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs index 2e895d911..2e895d911 100644 --- a/crates/ra_hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs index 1e748476a..1e748476a 100644 --- a/crates/ra_hir_ty/src/lib.rs +++ b/crates/hir_ty/src/lib.rs | |||
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index cd574e983..cd574e983 100644 --- a/crates/ra_hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs | |||
diff --git a/crates/ra_hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs index ec59145c7..ec59145c7 100644 --- a/crates/ra_hir_ty/src/method_resolution.rs +++ b/crates/hir_ty/src/method_resolution.rs | |||
diff --git a/crates/ra_hir_ty/src/op.rs b/crates/hir_ty/src/op.rs index 0870874fc..0870874fc 100644 --- a/crates/ra_hir_ty/src/op.rs +++ b/crates/hir_ty/src/op.rs | |||
diff --git a/crates/ra_hir_ty/src/primitive.rs b/crates/hir_ty/src/primitive.rs index 37966b709..37966b709 100644 --- a/crates/ra_hir_ty/src/primitive.rs +++ b/crates/hir_ty/src/primitive.rs | |||
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/hir_ty/src/test_db.rs index 15b8435e9..15b8435e9 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/hir_ty/src/test_db.rs | |||
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/hir_ty/src/tests.rs index f6b172c3a..c953925ec 100644 --- a/crates/ra_hir_ty/src/tests.rs +++ b/crates/hir_ty/src/tests.rs | |||
@@ -35,7 +35,7 @@ use crate::{ | |||
35 | 35 | ||
36 | // These tests compare the inference results for all expressions in a file | 36 | // These tests compare the inference results for all expressions in a file |
37 | // against snapshots of the expected results using expect. Use | 37 | // against snapshots of the expected results using expect. Use |
38 | // `env UPDATE_EXPECT=1 cargo test -p ra_hir_ty` to update the snapshots. | 38 | // `env UPDATE_EXPECT=1 cargo test -p hir_ty` to update the snapshots. |
39 | 39 | ||
40 | fn setup_tracing() -> tracing::subscriber::DefaultGuard { | 40 | fn setup_tracing() -> tracing::subscriber::DefaultGuard { |
41 | use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; | 41 | use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; |
diff --git a/crates/ra_hir_ty/src/tests/coercion.rs b/crates/hir_ty/src/tests/coercion.rs index 17efd75cb..17efd75cb 100644 --- a/crates/ra_hir_ty/src/tests/coercion.rs +++ b/crates/hir_ty/src/tests/coercion.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/display_source_code.rs b/crates/hir_ty/src/tests/display_source_code.rs index b502135d8..b502135d8 100644 --- a/crates/ra_hir_ty/src/tests/display_source_code.rs +++ b/crates/hir_ty/src/tests/display_source_code.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs index d887c7a79..d887c7a79 100644 --- a/crates/ra_hir_ty/src/tests/macros.rs +++ b/crates/hir_ty/src/tests/macros.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/hir_ty/src/tests/method_resolution.rs index fa68355aa..fa68355aa 100644 --- a/crates/ra_hir_ty/src/tests/method_resolution.rs +++ b/crates/hir_ty/src/tests/method_resolution.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/never_type.rs b/crates/hir_ty/src/tests/never_type.rs index 49538b572..49538b572 100644 --- a/crates/ra_hir_ty/src/tests/never_type.rs +++ b/crates/hir_ty/src/tests/never_type.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs b/crates/hir_ty/src/tests/patterns.rs index 39fabf7eb..39fabf7eb 100644 --- a/crates/ra_hir_ty/src/tests/patterns.rs +++ b/crates/hir_ty/src/tests/patterns.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/hir_ty/src/tests/regression.rs index b9ab0f357..b9ab0f357 100644 --- a/crates/ra_hir_ty/src/tests/regression.rs +++ b/crates/hir_ty/src/tests/regression.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs index 59eb59d5f..59eb59d5f 100644 --- a/crates/ra_hir_ty/src/tests/simple.rs +++ b/crates/hir_ty/src/tests/simple.rs | |||
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/hir_ty/src/tests/traits.rs index 526e61caf..526e61caf 100644 --- a/crates/ra_hir_ty/src/tests/traits.rs +++ b/crates/hir_ty/src/tests/traits.rs | |||
diff --git a/crates/ra_hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index 255323717..255323717 100644 --- a/crates/ra_hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs | |||
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index b33653417..b33653417 100644 --- a/crates/ra_hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs | |||
diff --git a/crates/ra_hir_ty/src/traits/chalk/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs index fc0f9c201..fc0f9c201 100644 --- a/crates/ra_hir_ty/src/traits/chalk/interner.rs +++ b/crates/hir_ty/src/traits/chalk/interner.rs | |||
diff --git a/crates/ra_hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs index fe62f3fa7..fe62f3fa7 100644 --- a/crates/ra_hir_ty/src/traits/chalk/mapping.rs +++ b/crates/hir_ty/src/traits/chalk/mapping.rs | |||
diff --git a/crates/ra_hir_ty/src/traits/chalk/tls.rs b/crates/hir_ty/src/traits/chalk/tls.rs index db915625c..db915625c 100644 --- a/crates/ra_hir_ty/src/traits/chalk/tls.rs +++ b/crates/hir_ty/src/traits/chalk/tls.rs | |||
diff --git a/crates/ra_hir_ty/src/utils.rs b/crates/hir_ty/src/utils.rs index e3e244268..e3e244268 100644 --- a/crates/ra_hir_ty/src/utils.rs +++ b/crates/hir_ty/src/utils.rs | |||
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index edca5dc6f..61cc099ac 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -22,4 +22,4 @@ base_db = { path = "../base_db" } | |||
22 | profile = { path = "../profile" } | 22 | profile = { path = "../profile" } |
23 | hir_expand = { path = "../hir_expand" } | 23 | hir_expand = { path = "../hir_expand" } |
24 | hir_def = { path = "../hir_def" } | 24 | hir_def = { path = "../hir_def" } |
25 | hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } | 25 | hir_ty = { path = "../hir_ty" } |
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 0dee719de..e17fe47da 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml | |||
@@ -51,7 +51,7 @@ ra_ide_db = { path = "../ra_ide_db" } | |||
51 | ra_ssr = { path = "../ra_ssr" } | 51 | ra_ssr = { path = "../ra_ssr" } |
52 | hir = { path = "../ra_hir", package = "ra_hir" } | 52 | hir = { path = "../ra_hir", package = "ra_hir" } |
53 | hir_def = { path = "../hir_def" } | 53 | hir_def = { path = "../hir_def" } |
54 | hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } | 54 | hir_ty = { path = "../hir_ty" } |
55 | proc_macro_srv = { path = "../proc_macro_srv" } | 55 | proc_macro_srv = { path = "../proc_macro_srv" } |
56 | 56 | ||
57 | [target.'cfg(windows)'.dependencies] | 57 | [target.'cfg(windows)'.dependencies] |
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index dc367d1e0..5a5bd4a3e 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs | |||
@@ -201,7 +201,7 @@ impl TidyDocs { | |||
201 | "project_model", | 201 | "project_model", |
202 | "syntax", | 202 | "syntax", |
203 | "tt", | 203 | "tt", |
204 | "ra_hir_ty", | 204 | "hir_ty", |
205 | ]; | 205 | ]; |
206 | 206 | ||
207 | let mut has_fixmes = | 207 | let mut has_fixmes = |