diff options
author | Marco Groppo <[email protected]> | 2019-04-18 19:34:10 +0100 |
---|---|---|
committer | Marco Groppo <[email protected]> | 2019-04-19 23:29:16 +0100 |
commit | 8ac3d1f9aa892fc891b69c7d8d00d39b9371d246 (patch) | |
tree | cdd2d8235d66022f13d221151d4bd0210075767f /crates/ra_hir/src/ty/method_resolution.rs | |
parent | 8ebb20edce85b74eab0ed78ba5c4969ec733ad12 (diff) |
lang_item_lookup is now a salsa query.
Diffstat (limited to 'crates/ra_hir/src/ty/method_resolution.rs')
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index dca56a434..ea6e0dc0f 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -14,7 +14,6 @@ use crate::{ | |||
14 | resolve::Resolver, | 14 | resolve::Resolver, |
15 | traits::TraitItem, | 15 | traits::TraitItem, |
16 | generics::HasGenericParams, | 16 | generics::HasGenericParams, |
17 | lang_item::lang_item_lookup, | ||
18 | ty::primitive::{UncertainIntTy, UncertainFloatTy} | 17 | ty::primitive::{UncertainIntTy, UncertainFloatTy} |
19 | }; | 18 | }; |
20 | use super::{TraitRef, Substs}; | 19 | use super::{TraitRef, Substs}; |
@@ -116,15 +115,15 @@ fn def_crate(db: &impl HirDatabase, cur_crate: Crate, ty: &Ty) -> Option<Crate> | |||
116 | match ty { | 115 | match ty { |
117 | Ty::Apply(a_ty) => match a_ty.ctor { | 116 | Ty::Apply(a_ty) => match a_ty.ctor { |
118 | TypeCtor::Adt(def_id) => def_id.krate(db), | 117 | TypeCtor::Adt(def_id) => def_id.krate(db), |
119 | TypeCtor::Bool => lang_item_lookup(db, cur_crate, "bool")?.krate(db), | 118 | TypeCtor::Bool => db.lang_item(cur_crate, "bool".into())?.krate(db), |
120 | TypeCtor::Char => lang_item_lookup(db, cur_crate, "char")?.krate(db), | 119 | TypeCtor::Char => db.lang_item(cur_crate, "char".into())?.krate(db), |
121 | TypeCtor::Float(UncertainFloatTy::Known(f)) => { | 120 | TypeCtor::Float(UncertainFloatTy::Known(f)) => { |
122 | lang_item_lookup(db, cur_crate, f.ty_to_string())?.krate(db) | 121 | db.lang_item(cur_crate, f.ty_to_string().into())?.krate(db) |
123 | } | 122 | } |
124 | TypeCtor::Int(UncertainIntTy::Known(i)) => { | 123 | TypeCtor::Int(UncertainIntTy::Known(i)) => { |
125 | lang_item_lookup(db, cur_crate, i.ty_to_string())?.krate(db) | 124 | db.lang_item(cur_crate, i.ty_to_string().into())?.krate(db) |
126 | } | 125 | } |
127 | TypeCtor::Str => lang_item_lookup(db, cur_crate, "str")?.krate(db), | 126 | TypeCtor::Str => db.lang_item(cur_crate, "str".into())?.krate(db), |
128 | _ => None, | 127 | _ => None, |
129 | }, | 128 | }, |
130 | _ => None, | 129 | _ => None, |