diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-03 18:26:01 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-03 18:26:01 +0100 |
| commit | 6a0083a519680e8d16bde5d7c1940c8dd6d4e9d4 (patch) | |
| tree | 2b377141d722257cfea18e74b955aea1a8f6cc1a /crates/ra_hir_expand/src | |
| parent | 1f7de306f547ecb394a34445fd6ac1d6bc8ab439 (diff) | |
| parent | 794f6da821c5d6e2490b996baffe162e4753262d (diff) | |
Merge branch 'master' into compute-lazy-assits
# Conflicts:
# crates/rust-analyzer/src/main_loop/handlers.rs
# crates/rust-analyzer/src/to_proto.rs
Diffstat (limited to 'crates/ra_hir_expand/src')
| -rw-r--r-- | crates/ra_hir_expand/src/name.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs index ea495cb11..660bdfe33 100644 --- a/crates/ra_hir_expand/src/name.rs +++ b/crates/ra_hir_expand/src/name.rs | |||
| @@ -153,6 +153,7 @@ pub mod known { | |||
| 153 | str, | 153 | str, |
| 154 | // Special names | 154 | // Special names |
| 155 | macro_rules, | 155 | macro_rules, |
| 156 | doc, | ||
| 156 | // Components of known path (value or mod name) | 157 | // Components of known path (value or mod name) |
| 157 | std, | 158 | std, |
| 158 | core, | 159 | core, |