use clippy rustc_tools_util to get rls version info and update clippy submodule

Author: matthiaskrgr

Cargo.lock

@@ -13,7 +13,7 @@ build = "build.rs"
 [dependencies]
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "04cec5fc10a7bbe1dccaad5729eff1823ef2608c" }
 cargo_metadata = "0.6"
-clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "183639b70bacf457920694d78a19cefe3565e1c0", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "125907ad08853b92d35e86aecebcf0f784f348d5", optional = true }
 env_logger = "0.5"
 failure = "0.1.1"
 itertools = "0.7.3"
@@ -31,6 +31,7 @@ rls-data = { version = "0.18", features = ["serialize-serde", "serialize-rustc"]
 rls-rustc = "0.5.0"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = "0.4.6"
+rustc_tools_util = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "125907ad08853b92d35e86aecebcf0f784f348d5" }
 rustfmt-nightly = "0.99.4"
 rustc-serialize = "0.3"
 serde = "1.0"
@@ -47,6 +48,9 @@ crossbeam-channel = "0.2.3"
 # for more information.
 rustc-workspace-hack = "1.0.0"
 
+[build-dependencies]
+rustc_tools_util = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "125907ad08853b92d35e86aecebcf0f784f348d5" }
+
 [features]
 default = ["clippy"]
 clippy = ["clippy_lints"]

Cargo.toml

@@ -8,53 +8,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-use std::process::Command;
-
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL");
 
-    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-
-    File::create(out_dir.join("commit-info.txt"))
-        .unwrap()
-        .write_all(commit_info().as_bytes())
-        .unwrap();
-}
-
-// Try to get hash and date of the last commit on a best effort basis. If anything goes wrong
-// (git not installed or if this is not a git repository) just return an empty string.
-fn commit_info() -> String {
-    match (commit_hash(), commit_date()) {
-        (Some(hash), Some(date)) => format!("{} ({} {})", channel(), hash.trim_right(), date),
-        _ => String::new(),
-    }
-}
-
-fn channel() -> String {
-    if let Ok(channel) = env::var("CFG_RELEASE_CHANNEL") {
-        channel
-    } else {
-        "nightly".to_owned()
-    }
-}
-
-fn commit_hash() -> Option<String> {
-    Command::new("git")
-        .args(&["rev-parse", "--short", "HEAD"])
-        .output()
-        .ok()
-        .and_then(|r| String::from_utf8(r.stdout).ok())
-}
-
-fn commit_date() -> Option<String> {
-    Command::new("git")
-        .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
-        .output()
-        .ok()
-        .and_then(|r| String::from_utf8(r.stdout).ok())
+    println!(
+        "cargo:rustc-env=GIT_HASH={}",
+        rustc_tools_util::get_commit_hash().unwrap_or_default()
+    );
+    println!(
+        "cargo:rustc-env=COMMIT_DATE={}",
+        rustc_tools_util::get_commit_date().unwrap_or_default()
+    );
 }

build.rs

@@ -38,6 +38,7 @@
 extern "C" {}
 
 use env_logger;
+use rustc_tools_util::*;
 
 use std::env;
 use std::sync::Arc;
@@ -83,7 +84,7 @@ fn main_inner() -> i32 {
     if let Some(first_arg) = ::std::env::args().nth(1) {
         return match first_arg.as_str() {
             "--version" | "-V" => {
-                println!("rls-preview {}", version());
+                println!("{}", version().replace("rls", "rls-preview"));
                 0
             }
             "--help" | "-h" => {
@@ -111,12 +112,9 @@ fn main_inner() -> i32 {
     server::run_server(analysis, vfs)
 }
 
-fn version() -> &'static str {
-    concat!(
-        env!("CARGO_PKG_VERSION"),
-        "-",
-        include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
-    )
+fn version() -> String {
+    let version = rustc_tools_util::get_version_info!();
+    version.to_string()
 }
 
 fn help() -> &'static str {