reconcile types

This commit is contained in:
Aiden McClelland
2021-08-05 11:23:20 -06:00
parent 32a1a2a24f
commit d657eceb08
11 changed files with 449 additions and 193 deletions

35
appmgr/Cargo.lock generated
View File

@@ -151,7 +151,7 @@ dependencies = [
"cfg-if 0.1.10",
"clang-sys",
"clap",
"env_logger",
"env_logger 0.7.1",
"lazy_static",
"lazycell",
"log",
@@ -873,7 +873,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"atty",
"humantime",
"humantime 1.3.0",
"log",
"regex",
"termcolor",
]
[[package]]
name = "env_logger"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
"humantime 2.1.0",
"log",
"regex",
"termcolor",
@@ -1241,6 +1254,12 @@ dependencies = [
"quick-error",
]
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.14.11"
@@ -1285,12 +1304,12 @@ source = "git+https://github.com/Start9Labs/hyper-ws-listener.git?branch=main#d5
dependencies = [
"anyhow",
"base64 0.13.0",
"env_logger",
"env_logger 0.9.0",
"futures",
"hyper",
"log",
"sha-1",
"tokio 1.8.1",
"tokio 1.9.0",
"tokio-tungstenite",
]
@@ -2528,9 +2547,9 @@ dependencies = [
[[package]]
name = "sha-1"
version = "0.9.6"
version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16"
checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
@@ -3184,7 +3203,7 @@ dependencies = [
"futures-util",
"log",
"pin-project",
"tokio 1.8.1",
"tokio 1.9.0",
"tungstenite",
]
@@ -3287,7 +3306,7 @@ dependencies = [
"httparse",
"input_buffer",
"log",
"rand 0.8.3",
"rand 0.8.4",
"sha-1",
"thiserror",
"url",