From f8ddef875af08f6c67fe69f7803f3926bc6f66bb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 30 Oct 2019 17:19:30 +0300
Subject: remove forward pointer for name

---
 crates/ra_hir/src/expr/lower.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_hir/src/expr')

diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs
index b3a9a2e6b..cf8a41b1e 100644
--- a/crates/ra_hir/src/expr/lower.rs
+++ b/crates/ra_hir/src/expr/lower.rs
@@ -1,5 +1,6 @@
 //! FIXME: write short doc here
 
+use hir_def::name::{self, AsName, Name};
 use ra_arena::Arena;
 use ra_syntax::{
     ast::{
@@ -12,7 +13,6 @@ use test_utils::tested_by;
 
 use crate::{
     db::HirDatabase,
-    name::{AsName, Name, SELF_PARAM},
     path::GenericArgs,
     ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
     type_ref::TypeRef,
@@ -78,7 +78,7 @@ where
                 let ptr = AstPtr::new(&self_param);
                 let param_pat = self.alloc_pat(
                     Pat::Bind {
-                        name: SELF_PARAM,
+                        name: name::SELF_PARAM,
                         mode: BindingAnnotation::Unannotated,
                         subpat: None,
                     },
-- 
cgit v1.2.3


From e56433432057712086ca623c4a1ef40089004839 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 30 Oct 2019 17:24:36 +0300
Subject: remove forward pointer to Path

---
 crates/ra_hir/src/expr/lower.rs      | 6 ++++--
 crates/ra_hir/src/expr/validation.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir/src/expr')

diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs
index cf8a41b1e..6436c3a24 100644
--- a/crates/ra_hir/src/expr/lower.rs
+++ b/crates/ra_hir/src/expr/lower.rs
@@ -1,6 +1,9 @@
 //! FIXME: write short doc here
 
-use hir_def::name::{self, AsName, Name};
+use hir_def::{
+    name::{self, AsName, Name},
+    path::GenericArgs,
+};
 use ra_arena::Arena;
 use ra_syntax::{
     ast::{
@@ -13,7 +16,6 @@ use test_utils::tested_by;
 
 use crate::{
     db::HirDatabase,
-    path::GenericArgs,
     ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
     type_ref::TypeRef,
     AstId, DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, Resolver,
diff --git a/crates/ra_hir/src/expr/validation.rs b/crates/ra_hir/src/expr/validation.rs
index 1aa853c3e..c685edda1 100644
--- a/crates/ra_hir/src/expr/validation.rs
+++ b/crates/ra_hir/src/expr/validation.rs
@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 
+use hir_def::path::known;
 use ra_syntax::ast;
 use rustc_hash::FxHashSet;
 
@@ -9,7 +10,6 @@ use crate::{
     db::HirDatabase,
     diagnostics::{DiagnosticSink, MissingFields, MissingOkInTailExpr},
     expr::AstPtr,
-    path::known,
     ty::{ApplicationTy, InferenceResult, Ty, TypeCtor},
     Adt, Function, Name, Path,
 };
-- 
cgit v1.2.3


From e5300ad3baf80c9903235a98a12b6cfd409e9f10 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 30 Oct 2019 17:28:30 +0300
Subject: remove forward pointer for type_ref

---
 crates/ra_hir/src/expr/lower.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/expr')

diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs
index 6436c3a24..ad029b868 100644
--- a/crates/ra_hir/src/expr/lower.rs
+++ b/crates/ra_hir/src/expr/lower.rs
@@ -3,6 +3,7 @@
 use hir_def::{
     name::{self, AsName, Name},
     path::GenericArgs,
+    type_ref::TypeRef,
 };
 use ra_arena::Arena;
 use ra_syntax::{
@@ -17,7 +18,6 @@ use test_utils::tested_by;
 use crate::{
     db::HirDatabase,
     ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
-    type_ref::TypeRef,
     AstId, DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, Resolver,
     Source,
 };
-- 
cgit v1.2.3