diff options
| author | Igor Aleksanov <[email protected]> | 2020-08-14 05:34:07 +0100 |
|---|---|---|
| committer | Igor Aleksanov <[email protected]> | 2020-08-14 05:34:07 +0100 |
| commit | c26c911ec1e6c2ad1dcb7d155a6a1d528839ad1a (patch) | |
| tree | 7cff36c38234be0afb65273146d8247083a5cfeb /editors | |
| parent | 3c018bf84de5c693b5ee1c6bec0fed3b201c2060 (diff) | |
| parent | f1f73649a686dc6e6449afc35e0fa6fed00e225d (diff) | |
Merge branch 'master' into add-disable-diagnostics
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/code/src/toolchain.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts index 80a7915e9..a5dc3cf0c 100644 --- a/editors/code/src/toolchain.ts +++ b/editors/code/src/toolchain.ts | |||
| @@ -121,12 +121,12 @@ export class Cargo { | |||
| 121 | } | 121 | } |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | /** Mirrors `ra_toolchain::cargo()` implementation */ | 124 | /** Mirrors `toolchain::cargo()` implementation */ |
| 125 | export function cargoPath(): string { | 125 | export function cargoPath(): string { |
| 126 | return getPathForExecutable("cargo"); | 126 | return getPathForExecutable("cargo"); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | /** Mirrors `ra_toolchain::get_path_for_executable()` implementation */ | 129 | /** Mirrors `toolchain::get_path_for_executable()` implementation */ |
| 130 | export const getPathForExecutable = memoize( | 130 | export const getPathForExecutable = memoize( |
| 131 | // We apply caching to decrease file-system interactions | 131 | // We apply caching to decrease file-system interactions |
| 132 | (executableName: "cargo" | "rustc" | "rustup"): string => { | 132 | (executableName: "cargo" | "rustc" | "rustup"): string => { |