@@ -142,26 +142,6 @@ function shouldIgnoreProjectPath(projectPath) {
142
142
. some ( path => path === projectPath . trim ( ) . replace ( / [ / \\ ] * $ / , '' ) )
143
143
}
144
144
145
- /**
146
- * @param {string } [toolchain]
147
- * @param {string } [cwd]
148
- * @return {Promise<string> } `rustc --print sysroot` stdout
149
- */
150
- async function rustcSysroot ( toolchain , cwd ) {
151
- try {
152
- let { stdout } = await rustupRun ( toolchain , "rustc --print sysroot" , { cwd } )
153
- return stdout . trim ( )
154
- } catch ( e ) {
155
- // make an attempt to use system rustc
156
- try {
157
- let { stdout } = await exec ( `rustc --print sysroot` , { cwd } )
158
- return stdout . trim ( )
159
- } catch ( sys_e ) {
160
- throw e
161
- }
162
- }
163
- }
164
-
165
145
/** @return {string } environment variable path */
166
146
let envPath = ( ) => {
167
147
// Make sure the cargo directory is in PATH
@@ -172,11 +152,9 @@ let envPath = () => {
172
152
}
173
153
174
154
/**
175
- * @param {string } [toolchain]
176
- * @param {string } [cwd]
177
155
* @return {Promise<object> } environment vars
178
156
*/
179
- async function serverEnv ( toolchain , cwd ) {
157
+ function serverEnv ( ) {
180
158
const env = process . env
181
159
env . PATH = envPath ( )
182
160
env . RUST_BACKTRACE = env . RUST_BACKTRACE || "1"
@@ -185,12 +163,6 @@ async function serverEnv(toolchain, cwd) {
185
163
// env.RUST_LOG = 'info'
186
164
// }
187
165
188
- try {
189
- let sysroot = await rustcSysroot ( toolchain , cwd )
190
- env . RUST_SRC_PATH = path . join ( sysroot , "/lib/rustlib/src/rust/src/" )
191
- } catch ( e ) {
192
- console . warn ( "Failed to find sysroot: " + e )
193
- }
194
166
return env
195
167
}
196
168
@@ -546,7 +518,7 @@ class RustLanguageClient extends AutoLanguageClient {
546
518
clearIdeRustNotifications ( "ide-rust.langServerCommand" )
547
519
548
520
return logSuspiciousStdout ( cp . spawn ( languageServerCmd , {
549
- env : await serverEnv ( configToolchain ( ) ) ,
521
+ env : serverEnv ( ) ,
550
522
shell : true ,
551
523
cwd : projectPath
552
524
} ) )
0 commit comments