diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-14 20:34:51 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-14 20:34:51 +0100 |
commit | 9dbf985df5515f4b9b40a7dcf74f916fa8d57ee3 (patch) | |
tree | 413c578cfb611cee88e380a57fd69a41ff642fc3 /crates | |
parent | 84b66107828365d02fd29641fe32b3c42f036864 (diff) | |
parent | 882daf424576d59b0dd089aa5facc9d98ac0b9fd (diff) |
Merge #1403
1403: Add alloc -> core dependency r=matklad a=flodiebold
Also a small fix for the ra-emacs-lsp company fix.
Co-authored-by: Florian Diebold <[email protected]>
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_project_model/src/sysroot.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs index 8b87aa7bd..72ccb61a7 100644 --- a/crates/ra_project_model/src/sysroot.rs +++ b/crates/ra_project_model/src/sysroot.rs | |||
@@ -70,6 +70,11 @@ impl Sysroot { | |||
70 | } | 70 | } |
71 | } | 71 | } |
72 | } | 72 | } |
73 | if let Some(alloc) = sysroot.by_name("alloc") { | ||
74 | if let Some(core) = sysroot.by_name("core") { | ||
75 | sysroot.crates[alloc].deps.push(core); | ||
76 | } | ||
77 | } | ||
73 | Ok(sysroot) | 78 | Ok(sysroot) |
74 | } | 79 | } |
75 | 80 | ||