Remove structopt from third-party
diff --git a/third-party/BUCK b/third-party/BUCK
index 9890a71..78fb2a9 100644
--- a/third-party/BUCK
+++ b/third-party/BUCK
@@ -22,6 +22,7 @@
name = "clap",
srcs = glob(["vendor/clap-2.33.1/src/**"]),
edition = "2015",
+ visibility = ["PUBLIC"],
deps = [
":bitflags",
":textwrap",
@@ -40,13 +41,6 @@
)
rust_library(
- name = "heck",
- srcs = glob(["vendor/heck-0.3.1/src/**"]),
- edition = "2015",
- deps = [":unicode-segmentation"],
-)
-
-rust_library(
name = "lazy_static",
srcs = glob(["vendor/lazy_static-1.4.0/src/**"]),
)
@@ -58,30 +52,6 @@
)
rust_library(
- name = "proc-macro-error",
- srcs = glob(["vendor/proc-macro-error-1.0.3/src/**"]),
- rustc_flags = ["--cfg=use_fallback"],
- deps = [
- ":proc-macro-error-attr",
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
- name = "proc-macro-error-attr",
- srcs = glob(["vendor/proc-macro-error-attr-1.0.3/src/**"]),
- proc_macro = True,
- deps = [
- ":proc-macro2",
- ":quote",
- ":syn",
- ":syn-mid",
- ],
-)
-
-rust_library(
name = "proc-macro2",
srcs = glob(["vendor/proc-macro2-1.0.19/src/**"]),
visibility = ["PUBLIC"],
@@ -106,30 +76,6 @@
)
rust_library(
- name = "structopt",
- srcs = glob(["vendor/structopt-0.3.15/src/**"]),
- visibility = ["PUBLIC"],
- deps = [
- ":clap",
- ":lazy_static",
- ":structopt-derive",
- ],
-)
-
-rust_library(
- name = "structopt-derive",
- srcs = glob(["vendor/structopt-derive-0.4.8/src/**"]),
- proc_macro = True,
- deps = [
- ":heck",
- ":proc-macro-error",
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
name = "syn",
srcs = glob(["vendor/syn-1.0.36/src/**"]),
visibility = ["PUBLIC"],
@@ -149,16 +95,6 @@
)
rust_library(
- name = "syn-mid",
- srcs = glob(["vendor/syn-mid-0.5.0/src/**"]),
- deps = [
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
name = "termcolor",
srcs = glob(["vendor/termcolor-1.1.0/src/**"]),
)
@@ -170,12 +106,6 @@
)
rust_library(
- name = "unicode-segmentation",
- srcs = glob(["vendor/unicode-segmentation-1.6.0/src/**"]),
- edition = "2015",
-)
-
-rust_library(
name = "unicode-width",
srcs = glob(["vendor/unicode-width-0.1.8/src/**"]),
)
diff --git a/third-party/BUILD b/third-party/BUILD
index a01d4b7..3e0e30b 100644
--- a/third-party/BUILD
+++ b/third-party/BUILD
@@ -27,6 +27,7 @@
name = "clap",
srcs = glob(["vendor/clap-2.33.1/src/**"]),
edition = "2015",
+ visibility = ["//visibility:public"],
deps = [
":bitflags",
":textwrap",
@@ -45,13 +46,6 @@
)
rust_library(
- name = "heck",
- srcs = glob(["vendor/heck-0.3.1/src/**"]),
- edition = "2015",
- deps = [":unicode-segmentation"],
-)
-
-rust_library(
name = "lazy_static",
srcs = glob(["vendor/lazy_static-1.4.0/src/**"]),
)
@@ -63,32 +57,6 @@
)
rust_library(
- name = "proc-macro-error",
- srcs = glob(["vendor/proc-macro-error-1.0.3/src/**"]),
- proc_macro_deps = [
- ":proc-macro-error-attr",
- ],
- rustc_flags = ["--cfg=use_fallback"],
- deps = [
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
- name = "proc-macro-error-attr",
- srcs = glob(["vendor/proc-macro-error-attr-1.0.3/src/**"]),
- crate_type = "proc-macro",
- deps = [
- ":proc-macro2",
- ":quote",
- ":syn",
- ":syn-mid",
- ],
-)
-
-rust_library(
name = "proc-macro2",
srcs = glob(["vendor/proc-macro2-1.0.19/src/**"]),
crate_features = [
@@ -113,32 +81,6 @@
)
rust_library(
- name = "structopt",
- srcs = glob(["vendor/structopt-0.3.15/src/**"]),
- proc_macro_deps = [
- ":structopt-derive",
- ],
- visibility = ["//visibility:public"],
- deps = [
- ":clap",
- ":lazy_static",
- ],
-)
-
-rust_library(
- name = "structopt-derive",
- srcs = glob(["vendor/structopt-derive-0.4.8/src/**"]),
- crate_type = "proc-macro",
- deps = [
- ":heck",
- ":proc-macro-error",
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
name = "syn",
srcs = glob(["vendor/syn-1.0.36/src/**"]),
crate_features = [
@@ -158,16 +100,6 @@
)
rust_library(
- name = "syn-mid",
- srcs = glob(["vendor/syn-mid-0.5.0/src/**"]),
- deps = [
- ":proc-macro2",
- ":quote",
- ":syn",
- ],
-)
-
-rust_library(
name = "termcolor",
srcs = glob(["vendor/termcolor-1.1.0/src/**"]),
)
@@ -179,12 +111,6 @@
)
rust_library(
- name = "unicode-segmentation",
- srcs = glob(["vendor/unicode-segmentation-1.6.0/src/**"]),
- edition = "2015",
-)
-
-rust_library(
name = "unicode-width",
srcs = glob(["vendor/unicode-width-0.1.8/src/**"]),
)
diff --git a/third-party/Cargo.lock b/third-party/Cargo.lock
index 8f40664..521c030 100644
--- a/third-party/Cargo.lock
+++ b/third-party/Cargo.lock
@@ -101,10 +101,10 @@
version = "0.3.4"
dependencies = [
"anyhow",
+ "clap",
"codespan-reporting",
"proc-macro2",
"quote",
- "structopt",
"syn",
]
@@ -139,15 +139,6 @@
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
name = "hermit-abi"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -184,32 +175,6 @@
]
[[package]]
-name = "proc-macro-error"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "syn-mid",
- "version_check",
-]
-
-[[package]]
name = "proc-macro2"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -282,30 +247,6 @@
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
-name = "structopt"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "syn"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -317,17 +258,6 @@
]
[[package]]
-name = "syn-mid"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "termcolor"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -370,12 +300,6 @@
]
[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-
-[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -394,12 +318,6 @@
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
-name = "version_check"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
-
-[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"