From 11e9e4b1fb48fb24a206c65c43fb374fe57dc26f Mon Sep 17 00:00:00 2001
From: vsrs <vit@conrlab.com>
Date: Thu, 30 Apr 2020 18:53:34 +0300
Subject: Removed unnecessary extraArgs for cargo invocation

---
 editors/code/src/cargo.ts              | 7 ++-----
 editors/code/src/commands/runnables.ts | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'editors/code/src')

diff --git a/editors/code/src/cargo.ts b/editors/code/src/cargo.ts
index 50f93856d..3a7e70307 100644
--- a/editors/code/src/cargo.ts
+++ b/editors/code/src/cargo.ts
@@ -55,12 +55,9 @@ export class Cargo {
         return artifacts;
     }
 
-    public async executableFromArgs(cargoArgs: string[], extraArgs?: string[]): Promise<string> {
+    public async executableFromArgs(args: string[]): Promise<string> {
+        let cargoArgs = [...args]; // to remain  args unchanged
         cargoArgs.push("--message-format=json");
-        if (extraArgs) {
-            cargoArgs.push('--');
-            cargoArgs.push(...extraArgs);
-        }
 
         const artifacts = await this.artifactsFromArgs(cargoArgs);
 
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index 36d309334..d77e8188c 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -84,7 +84,7 @@ async function getCppvsDebugConfig(config: ra.Runnable, sourceFileMap: Record<st
     debugOutput.clear();
 
     const cargo = new Cargo(config.cwd || '.', debugOutput);
-    const executable = await cargo.executableFromArgs(config.args, config.extraArgs);
+    const executable = await cargo.executableFromArgs(config.args);
 
     // if we are here, there were no compilation errors.
     return {
-- 
cgit v1.2.3