diff options
| author | Christian Duerr <contact@christianduerr.com> | 2020-10-25 02:07:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-25 05:07:28 +0300 |
| commit | 5a3bf69e3fd771271921f62219cdb8f920db39ee (patch) | |
| tree | 0a2315b5a5c486fb13d6e7f693a04f769c2a1c81 | |
| parent | 269f00051ea85e423a078e9b952ea526230e5338 (diff) | |
| download | alacritty-5a3bf69e3fd771271921f62219cdb8f920db39ee.tar.gz alacritty-5a3bf69e3fd771271921f62219cdb8f920db39ee.zip | |
Remove rustc_tools_util dependency
Since our usage of the rustc_tools_util crate is so trivial, it seems
like we should be able to just inline it directly into Alacritty.
It's a very well trusted crate, being hosted directly by rust-lang and
it does not pull in any other dependencies, but having a dependency for
just 6 lines of code seems a bit extreme.
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | alacritty/Cargo.toml | 1 | ||||
| -rw-r--r-- | alacritty/build.rs | 17 |
3 files changed, 13 insertions, 12 deletions
@@ -40,7 +40,6 @@ dependencies = [ "notify", "objc", "parking_lot", - "rustc_tools_util", "serde", "serde_json", "serde_yaml", @@ -1755,12 +1754,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_tools_util" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee" - -[[package]] name = "rusttype" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index a8ae5196..905003e5 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -32,7 +32,6 @@ unicode-width = "0.1" [build-dependencies] gl_generator = "0.14.0" -rustc_tools_util = "0.2.0" [target.'cfg(not(windows))'.dependencies] xdg = "2" diff --git a/alacritty/build.rs b/alacritty/build.rs index e8e0c114..3c0ec110 100644 --- a/alacritty/build.rs +++ b/alacritty/build.rs @@ -1,12 +1,12 @@ -use gl_generator::{Api, Fallbacks, GlobalGenerator, Profile, Registry}; - use std::env; use std::fs::File; use std::path::Path; +use std::process::Command; + +use gl_generator::{Api, Fallbacks, GlobalGenerator, Profile, Registry}; fn main() { - let hash = rustc_tools_util::get_commit_hash().unwrap_or_default(); - println!("cargo:rustc-env=GIT_HASH={}", hash); + println!("cargo:rustc-env=GIT_HASH={}", commit_hash()); let dest = env::var("OUT_DIR").unwrap(); let mut file = File::create(&Path::new(&dest).join("gl_bindings.rs")).unwrap(); @@ -18,3 +18,12 @@ fn main() { #[cfg(windows)] embed_resource::compile("../extra/windows/windows.rc"); } + +fn commit_hash() -> String { + Command::new("git") + .args(&["rev-parse", "--short", "HEAD"]) + .output() + .ok() + .and_then(|output| String::from_utf8(output.stdout).ok()) + .unwrap_or_default() +} |