diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-07 14:48:58 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-07 14:48:58 +0100 |
commit | 6c31f5b0a79c8b97110aaf854b839b57811c375a (patch) | |
tree | fe355f80c97e9e5fafe787ff0c9d5dd176df2c41 /crates/ra_hir/src/ty | |
parent | 89bfc59f1adc4c41235c4a17048c79c570eff6f4 (diff) | |
parent | 1c582be63b35c6602638023d4bd0bc426b0ca744 (diff) |
Merge #1499
1499: processing attribute #[path] of module r=matklad a=andreevlex
support two cases
- simple name file `foo.rs`
- declaration in mod.rs
#1211
Co-authored-by: Alexander Andreev <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 10a6e0b10..76ace66ea 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -116,7 +116,7 @@ impl CrateImplBlocks { | |||
116 | 116 | ||
117 | fn def_crates(db: &impl HirDatabase, cur_crate: Crate, ty: &Ty) -> Option<ArrayVec<[Crate; 2]>> { | 117 | fn def_crates(db: &impl HirDatabase, cur_crate: Crate, ty: &Ty) -> Option<ArrayVec<[Crate; 2]>> { |
118 | // Types like slice can have inherent impls in several crates, (core and alloc). | 118 | // Types like slice can have inherent impls in several crates, (core and alloc). |
119 | // The correspoinding impls are marked with lang items, so we can use them to find the required crates. | 119 | // The corresponding impls are marked with lang items, so we can use them to find the required crates. |
120 | macro_rules! lang_item_crate { | 120 | macro_rules! lang_item_crate { |
121 | ($db:expr, $cur_crate:expr, $($name:expr),+ $(,)?) => {{ | 121 | ($db:expr, $cur_crate:expr, $($name:expr),+ $(,)?) => {{ |
122 | let mut v = ArrayVec::<[Crate; 2]>::new(); | 122 | let mut v = ArrayVec::<[Crate; 2]>::new(); |