Undo the target-dir hack now that 1.26.1 is released

nrc · nrc · commit d214d0b4496b · 2018-06-04T15:42:26.000+12:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Unreleased
 
+### 0.4.5 - 2018-06-03
+
+* Undo the change to target directory default (unnecessary with Rust 1.26.1)
 
 ### 0.4.4 - 2018-05-17
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "rust",
     "displayName": "Rust (rls)",
     "description": "Rust language support - code completion, Intellisense, refactoring, reformatting, errors, snippets. A client for the Rust Language Server, built by the RLS team.",
-    "version": "0.4.4",
+    "version": "0.4.5",
     "publisher": "rust-lang",
     "icon": "rust-icon.png",
     "galleryBanner": {
@@ -309,7 +309,7 @@
                         "string",
                         "null"
                     ],
-                    "default": "target/rls",
+                    "default": null,
                     "description": "When specified, it places the generated analysis files at the specified target directory. By default it is placed target/rls directory."
                 }
             }
diff --git a/src/extension.ts b/src/extension.ts
@@ -65,7 +65,6 @@ async function makeRlsEnv(setLibPath = false): Promise<any> {
         }
     }
 
-
     console.info(`Setting sysroot to`, sysroot);
     if (!process.env.RUST_SRC_PATH) {
         env.RUST_SRC_PATH = sysroot + '/lib/rustlib/src/rust/src';

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ async function makeRlsEnv(setLibPath = false): Promise<any> {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`-`
`69`	`68`	console.info(`Setting sysroot to`, sysroot);
`70`	`69`	`if (!process.env.RUST_SRC_PATH) {`
`71`	`70`	`env.RUST_SRC_PATH = sysroot + '/lib/rustlib/src/rust/src';`