diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-02 12:58:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-02 12:58:28 +0100 |
commit | 131ccd95403e10131d6b8dfcad60ebc49c257c53 (patch) | |
tree | 3c7d02c26198f71bcb9d018b57024090c1ffa22c /editors/code/src/debug.ts | |
parent | 21132a7a748a70351f5d1ae6d8c51a3a0065013e (diff) | |
parent | d605ec9c321392d9c7ee4b440c560e1e405d92e6 (diff) |
Merge #4580
4580: Fix invoking cargo without consulting CARGO env var or standard installation paths r=matklad a=Veetaha
Followup for #4329
The pr essentially fixes [this bug](https://youtu.be/EzQ7YIIo1rY?t=2189)
cc @lefticus
Co-authored-by: veetaha <[email protected]>
Diffstat (limited to 'editors/code/src/debug.ts')
-rw-r--r-- | editors/code/src/debug.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts index 027504ecd..bdec5b735 100644 --- a/editors/code/src/debug.ts +++ b/editors/code/src/debug.ts | |||
@@ -3,7 +3,7 @@ import * as vscode from 'vscode'; | |||
3 | import * as path from 'path'; | 3 | import * as path from 'path'; |
4 | import * as ra from './lsp_ext'; | 4 | import * as ra from './lsp_ext'; |
5 | 5 | ||
6 | import { Cargo } from './cargo'; | 6 | import { Cargo } from './toolchain'; |
7 | import { Ctx } from "./ctx"; | 7 | import { Ctx } from "./ctx"; |
8 | 8 | ||
9 | const debugOutput = vscode.window.createOutputChannel("Debug"); | 9 | const debugOutput = vscode.window.createOutputChannel("Debug"); |