diff --git a/server/Cargo.lock b/server/Cargo.lock index 5a5cd8a..5301140 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -15,12 +15,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - [[package]] name = "ahash" version = "0.6.3" @@ -812,9 +806,6 @@ name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.7", -] [[package]] name = "hashbrown" @@ -825,15 +816,6 @@ dependencies = [ "ahash 0.7.2", ] -[[package]] -name = "hashlink" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" -dependencies = [ - "hashbrown 0.9.1", -] - [[package]] name = "hashlink" version = "0.7.0" @@ -1199,7 +1181,7 @@ dependencies = [ "failure", "fnv", "h264-reader", - "hashlink 0.6.0", + "hashlink", "itertools", "lazy_static", "libc", @@ -1225,7 +1207,8 @@ dependencies = [ [[package]] name = "moonfire-ffmpeg" version = "0.0.1" -source = "git+https://github.com/scottlamb/moonfire-ffmpeg#edb5c2d88ea02151ed647d41a779706955abf184" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcea35804beaed77b7b565730bcec888f5687a08408cd0986d89b94403a1cefa" dependencies = [ "cc", "libc", @@ -1332,9 +1315,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ "bitflags", "cc", @@ -1967,7 +1950,7 @@ dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.7.0", + "hashlink", "libsqlite3-sys", "memchr", "smallvec", @@ -2370,6 +2353,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + [[package]] name = "time" version = "0.1.43" @@ -2439,9 +2442,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b" +checksum = "1e96bb520beab540ab664bd5a9cfeaa1fcd846fa68c830b42e2c8963071251d2" dependencies = [ "futures-util", "log", @@ -2507,9 +2510,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" +checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" dependencies = [ "base64", "byteorder", @@ -2520,6 +2523,7 @@ dependencies = [ "log", "rand 0.8.3", "sha-1", + "thiserror", "url", "utf-8", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index d4bf34e..0cc4aa9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -30,7 +30,7 @@ cstr = "0.2.5" cursive = "0.16.3" db = { package = "moonfire-db", path = "db" } failure = "0.1.1" -ffmpeg = { package = "moonfire-ffmpeg", git = "https://github.com/scottlamb/moonfire-ffmpeg" } +ffmpeg = { package = "moonfire-ffmpeg", version = "0.0.1" } futures = "0.3" fnv = "1.0" h264-reader = { git = "https://github.com/dholroyd/h264-reader" } @@ -44,7 +44,7 @@ memchr = "2.0.2" memmap = "0.7" moonfire-tflite = { git = "https://github.com/scottlamb/moonfire-tflite", features = ["edgetpu"], optional = true } mylog = { git = "https://github.com/scottlamb/mylog" } -nix = "0.19.0" +nix = "0.20.0" nom = "6.0.0" parking_lot = { version = "0.11.1", features = [] } protobuf = { git = "https://github.com/stepancheg/rust-protobuf" } @@ -59,7 +59,7 @@ sync_wrapper = "0.1.0" time = "0.1" tokio = { version = "1.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "time"] } tokio-stream = "0.1.5" -tokio-tungstenite = "0.13.0" +tokio-tungstenite = "0.14.0" url = "2.1.1" uuid = { version = "0.8", features = ["serde", "std", "v4"] } diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml index 7c02656..7341153 100644 --- a/server/db/Cargo.toml +++ b/server/db/Cargo.toml @@ -21,13 +21,13 @@ cstr = "0.2.5" failure = "0.1.1" fnv = "1.0" h264-reader = { git = "https://github.com/dholroyd/h264-reader" } -hashlink = "0.6.0" +hashlink = "0.7.0" lazy_static = "1.0" libc = "0.2" libpasta = { git = "https://github.com/scottlamb/libpasta", branch = "pr-deps" } log = "0.4" mylog = { git = "https://github.com/scottlamb/mylog" } -nix = "0.19.0" +nix = "0.20.0" odds = { version = "0.4.0", features = ["std-vec"] } parking_lot = { version = "0.11.1", features = [] } pretty-hex = "0.2.1"