diff options
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index e44e144d6..de2c2dbec 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -11,7 +11,6 @@ relative-path = "0.4.0" | |||
11 | rustc-hash = "1.0" | 11 | rustc-hash = "1.0" |
12 | parking_lot = "0.8.0" | 12 | parking_lot = "0.8.0" |
13 | ena = "0.13" | 13 | ena = "0.13" |
14 | join_to_string = "0.1.3" | ||
15 | once_cell = "0.2" | 14 | once_cell = "0.2" |
16 | 15 | ||
17 | ra_syntax = { path = "../ra_syntax" } | 16 | ra_syntax = { path = "../ra_syntax" } |
@@ -28,5 +27,4 @@ chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } | |||
28 | lalrpop-intern = "0.15.1" | 27 | lalrpop-intern = "0.15.1" |
29 | 28 | ||
30 | [dev-dependencies] | 29 | [dev-dependencies] |
31 | flexi_logger = "0.13.0" | ||
32 | insta = "0.8.1" | 30 | insta = "0.8.1" |
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 76ace66ea..f65ad08a8 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -14,7 +14,7 @@ use crate::{ | |||
14 | nameres::CrateModuleId, | 14 | nameres::CrateModuleId, |
15 | resolve::Resolver, | 15 | resolve::Resolver, |
16 | traits::TraitItem, | 16 | traits::TraitItem, |
17 | ty::primitive::{UncertainFloatTy, UncertainIntTy}, | 17 | ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy}, |
18 | ty::{Ty, TypeCtor}, | 18 | ty::{Ty, TypeCtor}, |
19 | Crate, Function, HirDatabase, Module, Name, Trait, | 19 | Crate, Function, HirDatabase, Module, Name, Trait, |
20 | }; | 20 | }; |
@@ -132,9 +132,11 @@ fn def_crates(db: &impl HirDatabase, cur_crate: Crate, ty: &Ty) -> Option<ArrayV | |||
132 | TypeCtor::Adt(def_id) => Some(std::iter::once(def_id.krate(db)?).collect()), | 132 | TypeCtor::Adt(def_id) => Some(std::iter::once(def_id.krate(db)?).collect()), |
133 | TypeCtor::Bool => lang_item_crate!(db, cur_crate, "bool"), | 133 | TypeCtor::Bool => lang_item_crate!(db, cur_crate, "bool"), |
134 | TypeCtor::Char => lang_item_crate!(db, cur_crate, "char"), | 134 | TypeCtor::Char => lang_item_crate!(db, cur_crate, "char"), |
135 | TypeCtor::Float(UncertainFloatTy::Known(f)) => { | 135 | TypeCtor::Float(UncertainFloatTy::Known(f)) => match f.bitness { |
136 | lang_item_crate!(db, cur_crate, f.ty_to_string()) | 136 | // There are two lang items: one in libcore (fXX) and one in libstd (fXX_runtime) |
137 | } | 137 | FloatBitness::X32 => lang_item_crate!(db, cur_crate, "f32", "f32_runtime"), |
138 | FloatBitness::X64 => lang_item_crate!(db, cur_crate, "f64", "f64_runtime"), | ||
139 | }, | ||
138 | TypeCtor::Int(UncertainIntTy::Known(i)) => { | 140 | TypeCtor::Int(UncertainIntTy::Known(i)) => { |
139 | lang_item_crate!(db, cur_crate, i.ty_to_string()) | 141 | lang_item_crate!(db, cur_crate, i.ty_to_string()) |
140 | } | 142 | } |