From 030d78345fa79af07f8ebd89a9d244576fac992b Mon Sep 17 00:00:00 2001
From: veetaha <veetaha2@gmail.com>
Date: Sat, 23 May 2020 04:58:22 +0300
Subject: Fix invoking cargo without consulting CARGO or standard installation
 paths

---
 editors/code/src/cargo.ts | 4 ++--
 editors/code/src/tasks.ts | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'editors')

diff --git a/editors/code/src/cargo.ts b/editors/code/src/cargo.ts
index a55b2f860..46cd3d777 100644
--- a/editors/code/src/cargo.ts
+++ b/editors/code/src/cargo.ts
@@ -126,8 +126,8 @@ export class Cargo {
     }
 }
 
-// Mirrors `ra_env::get_path_for_executable` implementation
-function getCargoPathOrFail(): string {
+// Mirrors `ra_toolchain::cargo()` implementation
+export function getCargoPathOrFail(): string {
     const envVar = process.env.CARGO;
     const executableName = "cargo";
 
diff --git a/editors/code/src/tasks.ts b/editors/code/src/tasks.ts
index 1366c76d6..c22d69362 100644
--- a/editors/code/src/tasks.ts
+++ b/editors/code/src/tasks.ts
@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+import { getCargoPathOrFail } from "./cargo";
 
 // This ends up as the `type` key in tasks.json. RLS also uses `cargo` and
 // our configuration should be compatible with it so use the same key.
@@ -24,6 +25,8 @@ class CargoTaskProvider implements vscode.TaskProvider {
         // set of tasks that always exist. These tasks cannot be removed in
         // tasks.json - only tweaked.
 
+        const cargoPath = getCargoPathOrFail();
+
         return [
             { command: 'build', group: vscode.TaskGroup.Build },
             { command: 'check', group: vscode.TaskGroup.Build },
@@ -46,7 +49,7 @@ class CargoTaskProvider implements vscode.TaskProvider {
                     `cargo ${command}`,
                     'rust',
                     // What to do when this command is executed.
-                    new vscode.ShellExecution('cargo', [command]),
+                    new vscode.ShellExecution(cargoPath, [command]),
                     // Problem matchers.
                     ['$rustc'],
                 );
@@ -80,4 +83,4 @@ class CargoTaskProvider implements vscode.TaskProvider {
 export function activateTaskProvider(target: vscode.WorkspaceFolder): vscode.Disposable {
     const provider = new CargoTaskProvider(target);
     return vscode.tasks.registerTaskProvider(TASK_TYPE, provider);
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3