Merge branch 'master' into add-disable-diagnostics

This commit is contained in:
Igor Aleksanov 2020-08-14 07:34:07 +03:00
commit c26c911ec1
1140 changed files with 2355 additions and 2386 deletions

View file

@ -121,12 +121,12 @@ export class Cargo {
}
}
/** Mirrors `ra_toolchain::cargo()` implementation */
/** Mirrors `toolchain::cargo()` implementation */
export function cargoPath(): string {
return getPathForExecutable("cargo");
}
/** Mirrors `ra_toolchain::get_path_for_executable()` implementation */
/** Mirrors `toolchain::get_path_for_executable()` implementation */
export const getPathForExecutable = memoize(
// We apply caching to decrease file-system interactions
(executableName: "cargo" | "rustc" | "rustup"): string => {