diff options
| author | Zac Pullar-Strecker <[email protected]> | 2020-08-24 10:19:53 +0100 |
|---|---|---|
| committer | Zac Pullar-Strecker <[email protected]> | 2020-08-24 10:20:13 +0100 |
| commit | 7bbca7a1b3f9293d2f5cc5745199bc5f8396f2f0 (patch) | |
| tree | bdb47765991cb973b2cd5481a088fac636bd326c /editors/code/src/toolchain.ts | |
| parent | ca464650eeaca6195891199a93f4f76cf3e7e697 (diff) | |
| parent | e65d48d1fb3d4d91d9dc1148a7a836ff5c9a3c87 (diff) | |
Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links
Diffstat (limited to 'editors/code/src/toolchain.ts')
| -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 => { |