rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'editors/code/src/toolchain.ts')

-rw-r--r--

1 files changed, 5 insertions, 5 deletions

diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts
index 8c2e55bcc2..9c5c88c49e 100644
--- a/editors/code/src/toolchain.ts
+++ b/editors/code/src/toolchain.ts

@@ -3,7 +3,7 @@ import * as os from "os";

import * as path from "path";

import * as readline from "readline";

import * as vscode from "vscode";

-import {execute, log, memoizeAsync} from "./util";

+import { execute, log, memoizeAsync } from "./util";

interface CompilationArtifact {

fileName: string;

@@ -42,7 +42,7 @@ export class Cargo {

}

- const result: ArtifactSpec = {cargoArgs: cargoArgs};

+ const result: ArtifactSpec = { cargoArgs: cargoArgs };

if (cargoArgs[0] === "test" || cargoArgs[0] === "bench") {

// for instance, `crates\rust-analyzer\tests\heavy_tests\main.rs` tests

// produce 2 artifacts: {"kind": "bin"} and {"kind": "test"}

@@ -147,7 +147,7 @@ export class Cargo {

cargo.stderr.on("data", (chunk) => onStderrString(chunk.toString()));

- const rl = readline.createInterface({input: cargo.stdout});

+ const rl = readline.createInterface({ input: cargo.stdout });

rl.on("line", (line) => {

const message = JSON.parse(line);

onStdoutJson(message);

@@ -189,14 +189,14 @@ export async function getSysroot(dir: string): Promise<string> {

const rustcPath = await getPathForExecutable("rustc");

// do not memoize the result because the toolchain may change between runs

- return await execute(`${rustcPath} --print sysroot`, {cwd: dir});

+ return await execute(`${rustcPath} --print sysroot`, { cwd: dir });

}

export async function getRustcId(dir: string): Promise<string> {

const rustcPath = await getPathForExecutable("rustc");

// do not memoize the result because the toolchain may change between runs

- const data = await execute(`${rustcPath} -V -v`, {cwd: dir});

+ const data = await execute(`${rustcPath} -V -v`, { cwd: dir });

const rx = /commit-hash:\s(.*)$/m;

return rx.exec(data)![1];