From f79e55b45a2c7cd264e0630b06cd5c7ecf269303 Mon Sep 17 00:00:00 2001
From: DoHyung Kim <dohyung.kim@seasonfive.co>
Date: Wed, 27 May 2020 19:54:24 +0900
Subject: [PATCH] Upgrade vergen 3

---
 Cargo.lock | 55 ++----------------------------------------------------
 Cargo.toml |  2 +-
 build.rs   | 14 ++------------
 3 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 04a5019ce7..84e6e87678 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -933,15 +933,6 @@ dependencies = [
  "termcolor 1.0.4",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
-dependencies = [
- "backtrace",
-]
-
 [[package]]
 name = "ethbloom"
 version = "0.5.0"
@@ -1213,17 +1204,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "getset"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c7f36a235738bb25904d6a2b3dbb28f6f5736cd3918c4bf80d6bb236200782"
-dependencies = [
- "proc-macro2 0.3.8",
- "quote 0.5.2",
- "syn 0.13.11",
-]
-
 [[package]]
 name = "globset"
 version = "0.4.1"
@@ -2290,15 +2270,6 @@ dependencies = [
  "toml 0.5.3",
 ]
 
-[[package]]
-name = "proc-macro2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -2332,15 +2303,6 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 
-[[package]]
-name = "quote"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
-dependencies = [
- "proc-macro2 0.3.8",
-]
-
 [[package]]
 name = "quote"
 version = "0.6.12"
@@ -3035,17 +2997,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
-[[package]]
-name = "syn"
-version = "0.13.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
-dependencies = [
- "proc-macro2 0.3.8",
- "quote 0.5.2",
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "syn"
 version = "0.15.34"
@@ -3620,14 +3571,12 @@ dependencies = [
 
 [[package]]
 name = "vergen"
-version = "2.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a16834fc61e1492c07dae49b6c14b55f8b1d43a5f5f9e9a2ecc063f47b9f93c"
+checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb"
 dependencies = [
  "bitflags",
  "chrono",
- "error-chain",
- "getset",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4850644920..1167ccbe8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ toml = "0.4"
 cidr = "0.0.4"
 
 [build-dependencies]
-vergen = "2"
+vergen = "3"
 
 [[bin]]
 path = "foundry/main.rs"
diff --git a/build.rs b/build.rs
index 28972a6d94..7848e973d0 100644
--- a/build.rs
+++ b/build.rs
@@ -14,18 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use vergen::{ConstantsFlags, Result, Vergen};
+use vergen::{generate_cargo_keys, ConstantsFlags};
 
 fn main() {
-    gen_constants().expect("Unable to generate vergen constants!");
-}
-
-fn gen_constants() -> Result<()> {
-    let vergen = Vergen::new(ConstantsFlags::all())?;
-
-    for (k, v) in vergen.build_info() {
-        println!("cargo:rustc-env={}={}", k.name(), v);
-    }
-
-    Ok(())
+    generate_cargo_keys(ConstantsFlags::all()).expect("Unable to generate vergen constants!");
 }