summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2019-05-29 20:53:14 -0700
committerRyan Dahl <ry@tinyclouds.org>2019-06-25 06:32:28 -0700
commit89216c7baaab8ade3daf9103572647addeb404f3 (patch)
tree0bfb71586d800448ab10e51876050ffc305b4ab0
parent046cbef4f0f11e37d6ffb8b01c6362c8ce0b750d (diff)
third_party: add rust crate 'termcolor'
-rw-r--r--Cargo.lock29
-rw-r--r--build_extra/rust/BUILD.gn35
-rw-r--r--cli/BUILD.gn1
-rw-r--r--cli/Cargo.toml1
m---------third_party0
5 files changed, 66 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c2217a130..e5ba0961e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -238,6 +238,7 @@ dependencies = [
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
"source-map-mappings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1064,6 +1065,14 @@ dependencies = [
]
[[package]]
+name = "termcolor"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "termion"
version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1474,11 +1483,28 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "winapi-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "wincolor"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1605,6 +1631,7 @@ dependencies = [
"checksum syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)" = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c"
"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
"checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef"
+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
"checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330"
"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
@@ -1649,5 +1676,7 @@ dependencies = [
"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn
index d7c3415fe..b1a36fedf 100644
--- a/build_extra/rust/BUILD.gn
+++ b/build_extra/rust/BUILD.gn
@@ -1468,6 +1468,18 @@ rust_rlib("tempfile") {
}
}
+rust_rlib("termcolor") {
+ edition = "2015"
+ source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/termcolor-1.0.4/src/lib.rs"
+ args = [
+ "--cap-lints",
+ "allow",
+ ]
+ if (is_win) {
+ extern_rlib = [ "wincolor" ]
+ }
+}
+
rust_rlib("textwrap") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/textwrap-0.11.0/src/lib.rs"
@@ -2353,6 +2365,29 @@ if (is_win) {
]
}
+ rust_rlib("winapi_util") {
+ edition = "2015"
+ source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-util-0.1.2/src/lib.rs"
+ extern_rlib = [ "winapi" ]
+ args = [
+ "--cap-lints",
+ "allow",
+ ]
+ }
+
+ rust_rlib("wincolor") {
+ edition = "2015"
+ source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/wincolor-1.0.1/src/lib.rs"
+ extern_rlib = [
+ "winapi",
+ "winapi_util",
+ ]
+ args = [
+ "--cap-lints",
+ "allow",
+ ]
+ }
+
rust_rlib("ws2_32") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ws2_32-sys-0.2.1/src/lib.rs"
diff --git a/cli/BUILD.gn b/cli/BUILD.gn
index 13a8c0ba0..72cf8710b 100644
--- a/cli/BUILD.gn
+++ b/cli/BUILD.gn
@@ -42,6 +42,7 @@ main_extern_rlib = [
"serde_json",
"source_map_mappings",
"tempfile",
+ "termcolor",
"tokio",
"tokio_executor",
"tokio_fs",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index dac188a9e..6289f9bb4 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -42,6 +42,7 @@ serde_derive = "1.0.92"
serde_json = { version = "1.0.39", features = [ "preserve_order" ] }
source-map-mappings = "0.5.0"
tempfile = "3.0.8"
+termcolor = "1.0.4"
tokio = "0.1.21"
tokio-executor = "0.1.7"
tokio-fs = "0.1.6"
diff --git a/third_party b/third_party
-Subproject c29d758cd2ca6fd275f141239d59560157ac453
+Subproject 4c9d6c9f133cae292528d3b68e55249acd8c1b1