Auto merge of #44176 - nrc:update-rls, r=alexcrichton

bors · bors · commit 5e9431a6f517 · 2017-09-03T00:51:47.000Z
Update rls And expose the `CFG_VERSION` env var to tools so they can determine the version of Rust. This gets the RLS back on master and so completes the PR dance for the generators PR. r? @alexcrichton
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
@@ -120,6 +120,7 @@ fn prepare_tool_cargo(
     }
 
     cargo.env("CFG_RELEASE_CHANNEL", &build.config.channel);
+    cargo.env("CFG_VERSION", build.rust_version());
 
     let info = GitInfo::new(&build.config, &dir);
     if let Some(sha) = info.sha() {
diff --git a/src/tools/rls b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 144ce17f4d13fe10f386d42e3735956e9549167e
+Subproject commit 303671ea8103cbc39575a1f47a204159546a04d0

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ fn prepare_tool_cargo(`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`cargo.env("CFG_RELEASE_CHANNEL", &build.config.channel);`
	`123`	`+ cargo.env("CFG_VERSION", build.rust_version());`
`123`	`124`
`124`	`125`	`let info = GitInfo::new(&build.config, &dir);`
`125`	`126`	`if let Some(sha) = info.sha() {`