diff --git a/Cargo.lock b/Cargo.lock index b76bd53..7dd40f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,8 +8,8 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" dependencies = [ - "lazy_static 1.4.0", - "regex 1.5.5", + "lazy_static", + "regex", ] [[package]] @@ -74,15 +74,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "0.7.18" @@ -104,7 +95,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -201,7 +192,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -311,7 +302,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -573,7 +564,7 @@ dependencies = [ "num-traits", "serde", "time 0.1.44", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -611,7 +602,7 @@ dependencies = [ "clap_derive", "clap_lex", "indexmap", - "lazy_static 1.4.0", + "lazy_static", "strsim 0.10.0", "termcolor", "textwrap 0.15.0", @@ -639,27 +630,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "clicolors-control" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495303f76458db51aa330df9510cfbb2e3ad57c6b82da7b38aad2a89088a91da" -dependencies = [ - "clicolors-control 1.0.1", -] - -[[package]] -name = "clicolors-control" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" -dependencies = [ - "atty", - "lazy_static 1.4.0", - "libc", - "winapi 0.3.9", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -682,29 +652,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" dependencies = [ "async-trait", - "lazy_static 1.4.0", + "lazy_static", "nom", "pathdiff", "serde", "yaml-rust", ] -[[package]] -name = "console" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5682f3fb20402e2698bdc0ae90cb30ba1e8383b727ca0c026566fc972ca2c167" -dependencies = [ - "clicolors-control 0.3.2", - "kernel32-sys", - "lazy_static 0.2.11", - "libc", - "parking_lot 0.12.0", - "regex 0.2.11", - "unicode-width", - "winapi 0.3.9", -] - [[package]] name = "console" version = "0.15.0" @@ -714,10 +668,10 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "regex 1.5.5", + "regex", "terminal_size", "unicode-width", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -747,7 +701,7 @@ dependencies = [ "prost-types", "serde", "serde_json", - "thread_local 1.1.4", + "thread_local", "tokio", "tokio-stream", "tonic", @@ -862,7 +816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", - "lazy_static 1.4.0", + "lazy_static", ] [[package]] @@ -965,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47003dc9f6368a88e85956c3b2573a7e6872746a3e5d762a8885da3a136a0381" dependencies = [ "backtrace", - "lazy_static 1.4.0", + "lazy_static", "parking_lot 0.11.2", "rustc-hash", "serde", @@ -979,7 +933,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349d6b4fabcd9e97e1df1ae15395ac7e49fb144946a0d453959dc2696273b9da" dependencies = [ - "console 0.15.0", + "console", "tempfile", "zeroize", ] @@ -1021,7 +975,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1075,7 +1029,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.13", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1628,7 +1582,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "redox_syscall 0.1.57", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1655,16 +1609,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "kqueue" version = "1.0.5" @@ -1694,12 +1638,6 @@ dependencies = [ "log", ] -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - [[package]] name = "lazy_static" version = "1.4.0" @@ -1836,7 +1774,7 @@ dependencies = [ "miow", "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1845,7 +1783,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1873,7 +1811,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", "libc", "log", "openssl", @@ -1910,7 +1848,7 @@ dependencies = [ "libc", "mio", "walkdir", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1919,7 +1857,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2148,7 +2086,7 @@ dependencies = [ "libc", "redox_syscall 0.2.13", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2308,7 +2246,7 @@ dependencies = [ "poem-derive", "priority-queue", "rand", - "regex 1.5.5", + "regex", "rustls-pemfile", "serde", "serde_json", @@ -2352,7 +2290,7 @@ dependencies = [ "num-traits", "poem", "poem-openapi-derive", - "regex 1.5.5", + "regex", "serde", "serde_json", "serde_urlencoded", @@ -2375,7 +2313,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex 1.5.5", + "regex", "syn", "thiserror", ] @@ -2390,7 +2328,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2585,28 +2523,15 @@ dependencies = [ "thiserror", ] -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local 0.3.6", - "utf8-ranges", -] - [[package]] name = "regex" version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ - "aho-corasick 0.7.18", + "aho-corasick", "memchr", - "regex-syntax 0.6.25", + "regex-syntax", ] [[package]] @@ -2615,16 +2540,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.25", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", + "regex-syntax", ] [[package]] @@ -2639,7 +2555,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2654,7 +2570,7 @@ dependencies = [ "spin 0.5.2", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2687,7 +2603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89fd30a2ef98dfa621409d5bc56a2479d5810bf13a5eea3de89d859437b7e2e" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2729,7 +2645,7 @@ version = "0.3.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01be4f65a8447ddbbac295d381c065e3a74f8c944aad48e37f64e53e1942f186" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", "libc", "libsodium-sys", "pkg-config", @@ -2850,8 +2766,8 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", + "lazy_static", + "winapi", ] [[package]] @@ -3117,7 +3033,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", ] [[package]] @@ -3154,7 +3070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3335,7 +3251,7 @@ dependencies = [ "libc", "redox_syscall 0.2.13", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3354,7 +3270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3398,15 +3314,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static 1.4.0", -] - [[package]] name = "thread_local" version = "1.1.4" @@ -3424,7 +3331,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3477,7 +3384,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3694,7 +3601,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", "valuable", ] @@ -3714,7 +3621,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", "log", "tracing-core", ] @@ -3726,12 +3633,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", - "lazy_static 1.4.0", + "lazy_static", "matchers", - "regex 1.5.5", + "regex", "sharded-slab", "smallvec", - "thread_local 1.1.4", + "thread_local", "time 0.3.9", "tracing", "tracing-core", @@ -3769,12 +3676,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "ucd-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" - [[package]] name = "unicase" version = "2.6.0" @@ -3857,12 +3758,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - [[package]] name = "uuid" version = "0.8.2" @@ -3920,7 +3815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -3944,7 +3839,7 @@ dependencies = [ "bytes", "clap 3.1.12", "config", - "console 0.1.0", + "console", "console-subscriber", "data-encoding", "dhat", @@ -4004,7 +3899,7 @@ dependencies = [ "chrono", "data-encoding", "humantime-serde", - "lazy_static 1.4.0", + "lazy_static", "packet", "password-hash 0.3.2", "poem-openapi", @@ -4097,7 +3992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", - "lazy_static 1.4.0", + "lazy_static", "log", "proc-macro2", "quote", @@ -4175,12 +4070,6 @@ dependencies = [ "cc", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -4191,12 +4080,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -4209,7 +4092,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] diff --git a/warpgate/Cargo.toml b/warpgate/Cargo.toml index fb01880..e572889 100644 --- a/warpgate/Cargo.toml +++ b/warpgate/Cargo.toml @@ -11,7 +11,7 @@ async-trait = "0.1" bytes = "1.1" clap = {version = "3.1", features = ["derive"]} config = {version = "0.12", features = ["yaml"], default_features = false} -console = {version = "0.1", default_features = false} +console = {version = "0.15", default_features = false} console-subscriber = {version = "0.1", optional = true} data-encoding = "2.3" dhat = {version = "0.3", optional = true}