Remove redundant dependencies

Signed-off-by: JmPotato <ghzpotato@gmail.com>

diff --git a/Cargo.lock b/Cargo.lock
index 936e863f52f8799eee732962e4815efe49608923..a094ec4f7aef0331a1ef11064b8c0764214adabf 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -912,7 +912,6 @@ dependencies = [
  "ra_db",
  "ra_fmt",
  "ra_hir",
- "ra_hir_expand",
  "ra_ide_db",
  "ra_prof",
  "ra_syntax",

diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index a436e861d7ec7a15258b4b7cef36868c025f4275..bd2905f080af30b0e6c1a2ca1302bd2b2b1fbb28 100644 (file)
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -22,5 +22,4 @@ ra_prof = { path = "../ra_prof" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
-hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
 test_utils = { path = "../test_utils" }

diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs
index 02c4a4baeb0c7d27d7045bd7b49f2e06c42058c7..6c92124eda1b40f321e46a2d33396b69ee7ef32f 100644 (file)
--- a/crates/ra_assists/src/ast_transform.rs
+++ b/crates/ra_assists/src/ast_transform.rs
@@ -2,7 +2,6 @@
 use rustc_hash::FxHashMap;
 
 use hir::{HirDisplay, PathResolution, SemanticsScope};
-use hir_expand::hygiene::Hygiene;
 use ra_syntax::{
     algo::SyntaxRewriter,
     ast::{self, AstNode},
@@ -111,7 +110,7 @@ fn get_substitution_inner(
             ast::Type::PathType(path_type) => path_type.path()?,
             _ => return None,
         };
-        let path = hir::Path::from_src(path, &Hygiene::new_unhygienic())?;
+        let path = hir::Path::from_src(path, &hir::Hygiene::new_unhygienic())?;
         let resolution = self.source_scope.resolve_hir_path(&path)?;
         match resolution {
             hir::PathResolution::TypeParam(tp) => Some(self.substs.get(&tp)?.syntax().clone()),
@@ -151,7 +150,7 @@ fn get_substitution_inner(
             // don't try to qualify `Fn(Foo) -> Bar` paths, they are in prelude anyway
             return None;
         }
-        let hir_path = hir::Path::from_src(p.clone(), &Hygiene::new_unhygienic())?;
+        let hir_path = hir::Path::from_src(p.clone(), &hir::Hygiene::new_unhygienic())?;
         let resolution = self.source_scope.resolve_hir_path(&hir_path)?;
         match resolution {
             PathResolution::Def(def) => {