From b69dfddb572b9182f4880065ca5034aba8b15ce3 Mon Sep 17 00:00:00 2001
From: JmPotato <ghzpotato@gmail.com>
Date: Tue, 11 Aug 2020 14:35:15 +0800
Subject: Remove redundant dependencies
Signed-off-by: JmPotato <ghzpotato@gmail.com>
---
Cargo.lock | 1 -
crates/ra_assists/Cargo.toml | 1 -
crates/ra_assists/src/ast_transform.rs | 5 ++---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 936e863f5..a094ec4f7 100644
--- 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 a436e861d..bd2905f08 100644
--- 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 02c4a4bae..6c92124ed 100644
--- 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 @@ impl<'a> SubstituteTypeParams<'a> {
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 @@ impl<'a> QualifyPaths<'a> {
// 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) => {
--
cgit v1.2.3