Rename ra_hir_ty -> hir_ty

rust-lang · Aug 13, 2020 · 6a77ec7 · 6a77ec7
1 parent 50f8c1e
commit 6a77ec7
Show file tree

Hide file tree

Showing 40 changed files with 44 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ra_hir_ty/Cargo.toml → crates/hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml → crates/hir_ty/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
-name = "ra_hir_ty"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "hir_ty"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
@@ -15,9 +15,12 @@ smallvec = "1.2.0"
 ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
+scoped-tls = "1"
+chalk-solve = { version = "0.21.0" }
+chalk-ir = { version = "0.21.0" }
+chalk-recursive = { version = "0.21.0" }
 
 stdx = { path = "../stdx" }
-
 hir_def = { path = "../hir_def" }
 hir_expand = { path = "../hir_expand" }
 arena = { path = "../arena" }
@@ -26,15 +29,9 @@ profile = { path = "../profile" }
 syntax = { path = "../syntax" }
 test_utils = { path = "../test_utils" }
 
-scoped-tls = "1"
-
-chalk-solve = { version = "0.21.0" }
-chalk-ir = { version = "0.21.0" }
-chalk-recursive = { version = "0.21.0" }
-
 [dev-dependencies]
-expect = { path = "../expect" }
-
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] }
 tracing-tree = { version = "0.1.4" }
+
+expect = { path = "../expect" }
diff --git a/crates/ra_hir_ty/src/autoderef.rs → crates/hir_ty/src/autoderef.rs b/crates/ra_hir_ty/src/autoderef.rs → crates/hir_ty/src/autoderef.rs
diff --git a/crates/ra_hir_ty/src/db.rs → crates/hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs → crates/hir_ty/src/db.rs
diff --git a/crates/ra_hir_ty/src/diagnostics.rs → crates/hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs → crates/hir_ty/src/diagnostics.rs
diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs → crates/hir_ty/src/diagnostics/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs → crates/hir_ty/src/diagnostics/expr.rs
diff --git a/.../ra_hir_ty/src/diagnostics/match_check.rs → crates/hir_ty/src/diagnostics/match_check.rs b/.../ra_hir_ty/src/diagnostics/match_check.rs → crates/hir_ty/src/diagnostics/match_check.rs
diff --git a/...ra_hir_ty/src/diagnostics/unsafe_check.rs → ...es/hir_ty/src/diagnostics/unsafe_check.rs b/...ra_hir_ty/src/diagnostics/unsafe_check.rs → ...es/hir_ty/src/diagnostics/unsafe_check.rs
diff --git a/crates/ra_hir_ty/src/display.rs → crates/hir_ty/src/display.rs b/crates/ra_hir_ty/src/display.rs → crates/hir_ty/src/display.rs
diff --git a/crates/ra_hir_ty/src/infer.rs → crates/hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs → crates/hir_ty/src/infer.rs
diff --git a/crates/ra_hir_ty/src/infer/coerce.rs → crates/hir_ty/src/infer/coerce.rs b/crates/ra_hir_ty/src/infer/coerce.rs → crates/hir_ty/src/infer/coerce.rs
diff --git a/crates/ra_hir_ty/src/infer/expr.rs → crates/hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs → crates/hir_ty/src/infer/expr.rs
diff --git a/crates/ra_hir_ty/src/infer/pat.rs → crates/hir_ty/src/infer/pat.rs b/crates/ra_hir_ty/src/infer/pat.rs → crates/hir_ty/src/infer/pat.rs
diff --git a/crates/ra_hir_ty/src/infer/path.rs → crates/hir_ty/src/infer/path.rs b/crates/ra_hir_ty/src/infer/path.rs → crates/hir_ty/src/infer/path.rs
diff --git a/crates/ra_hir_ty/src/infer/unify.rs → crates/hir_ty/src/infer/unify.rs b/crates/ra_hir_ty/src/infer/unify.rs → crates/hir_ty/src/infer/unify.rs
diff --git a/crates/ra_hir_ty/src/lib.rs → crates/hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs → crates/hir_ty/src/lib.rs
diff --git a/crates/ra_hir_ty/src/lower.rs → crates/hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs → crates/hir_ty/src/lower.rs
diff --git a/crates/ra_hir_ty/src/method_resolution.rs → crates/hir_ty/src/method_resolution.rs b/crates/ra_hir_ty/src/method_resolution.rs → crates/hir_ty/src/method_resolution.rs
diff --git a/crates/ra_hir_ty/src/op.rs → crates/hir_ty/src/op.rs b/crates/ra_hir_ty/src/op.rs → crates/hir_ty/src/op.rs
diff --git a/crates/ra_hir_ty/src/primitive.rs → crates/hir_ty/src/primitive.rs b/crates/ra_hir_ty/src/primitive.rs → crates/hir_ty/src/primitive.rs
diff --git a/crates/ra_hir_ty/src/test_db.rs → crates/hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs → crates/hir_ty/src/test_db.rs
diff --git a/crates/ra_hir_ty/src/tests.rs → crates/hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs → crates/hir_ty/src/tests.rs
@@ -35,7 +35,7 @@ use crate::{
 
 // These tests compare the inference results for all expressions in a file
 // against snapshots of the expected results using expect. Use
-// `env UPDATE_EXPECT=1 cargo test -p ra_hir_ty` to update the snapshots.
+// `env UPDATE_EXPECT=1 cargo test -p hir_ty` to update the snapshots.
 
 fn setup_tracing() -> tracing::subscriber::DefaultGuard {
     use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};

diff --git a/crates/ra_hir_ty/src/tests/coercion.rs → crates/hir_ty/src/tests/coercion.rs b/crates/ra_hir_ty/src/tests/coercion.rs → crates/hir_ty/src/tests/coercion.rs
diff --git a/...a_hir_ty/src/tests/display_source_code.rs → ...s/hir_ty/src/tests/display_source_code.rs b/...a_hir_ty/src/tests/display_source_code.rs → ...s/hir_ty/src/tests/display_source_code.rs
diff --git a/crates/ra_hir_ty/src/tests/macros.rs → crates/hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs → crates/hir_ty/src/tests/macros.rs
diff --git a/.../ra_hir_ty/src/tests/method_resolution.rs → crates/hir_ty/src/tests/method_resolution.rs b/.../ra_hir_ty/src/tests/method_resolution.rs → crates/hir_ty/src/tests/method_resolution.rs
diff --git a/crates/ra_hir_ty/src/tests/never_type.rs → crates/hir_ty/src/tests/never_type.rs b/crates/ra_hir_ty/src/tests/never_type.rs → crates/hir_ty/src/tests/never_type.rs
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs → crates/hir_ty/src/tests/patterns.rs b/crates/ra_hir_ty/src/tests/patterns.rs → crates/hir_ty/src/tests/patterns.rs
diff --git a/crates/ra_hir_ty/src/tests/regression.rs → crates/hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs → crates/hir_ty/src/tests/regression.rs
diff --git a/crates/ra_hir_ty/src/tests/simple.rs → crates/hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs → crates/hir_ty/src/tests/simple.rs
diff --git a/crates/ra_hir_ty/src/tests/traits.rs → crates/hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs → crates/hir_ty/src/tests/traits.rs
diff --git a/crates/ra_hir_ty/src/traits.rs → crates/hir_ty/src/traits.rs b/crates/ra_hir_ty/src/traits.rs → crates/hir_ty/src/traits.rs
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs → crates/hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs → crates/hir_ty/src/traits/chalk.rs
diff --git a/...es/ra_hir_ty/src/traits/chalk/interner.rs → crates/hir_ty/src/traits/chalk/interner.rs b/...es/ra_hir_ty/src/traits/chalk/interner.rs → crates/hir_ty/src/traits/chalk/interner.rs
diff --git a/crates/ra_hir_ty/src/traits/chalk/mapping.rs → crates/hir_ty/src/traits/chalk/mapping.rs b/crates/ra_hir_ty/src/traits/chalk/mapping.rs → crates/hir_ty/src/traits/chalk/mapping.rs
diff --git a/crates/ra_hir_ty/src/traits/chalk/tls.rs → crates/hir_ty/src/traits/chalk/tls.rs b/crates/ra_hir_ty/src/traits/chalk/tls.rs → crates/hir_ty/src/traits/chalk/tls.rs
diff --git a/crates/ra_hir_ty/src/utils.rs → crates/hir_ty/src/utils.rs b/crates/ra_hir_ty/src/utils.rs → crates/hir_ty/src/utils.rs
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
@@ -22,4 +22,4 @@ base_db = { path = "../base_db" }
 profile = { path = "../profile" }
 hir_expand = { path = "../hir_expand" }
 hir_def = { path = "../hir_def" }
-hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
+hir_ty = { path = "../hir_ty" }
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
@@ -51,7 +51,7 @@ ra_ide_db = { path = "../ra_ide_db" }
 ra_ssr = { path = "../ra_ssr" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 hir_def = { path = "../hir_def" }
-hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
+hir_ty = { path = "../hir_ty" }
 proc_macro_srv = { path = "../proc_macro_srv" }
 
 [target.'cfg(windows)'.dependencies]

diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
@@ -201,7 +201,7 @@ impl TidyDocs {
             "project_model",
             "syntax",
             "tt",
-            "ra_hir_ty",
+            "hir_ty",
         ];
 
         let mut has_fixmes =