diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-14 15:42:07 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-14 15:42:07 +0000 |
| commit | d50a37d3aa473937919030b39587df3d93f9bd8c (patch) | |
| tree | e30c945fac77128eae6823a651674e787669ea8e /crates/ide_db/src/imports_locator.rs | |
| parent | 63c5c928561b45dcef5c13881f09e5bc98c1eb9a (diff) | |
| parent | 4a6e602c9419cc5ed464343b2373c7fe86fb89d6 (diff) | |
| parent | 471795b019d800dca65e2a400fbdb166e6f821cd (diff) | |
Merge #7643 #7663
7643: Automatically detect the rustc-src directory (fixes #3517) r=matklad a=bnjbvr
If the configured rustcSource was not set, then try to automatically
detect a source for the sysroot rustc directory.
I wasn't sure how to do it in the case of the project.json file, though.
7663: Tolerate spaces in nix binary patching r=matklad a=CertainLach
If path to original file contains space (I.e on code insiders, where
default data directory is ~/Code - Insiders/), then there is syntax
error evaluating src arg.
Instead pass path as str, and coerce to path back in nix expression
Co-authored-by: Benjamin Bouvier <[email protected]>
Co-authored-by: Yaroslav Bolyukin <[email protected]>