From e5707f6557e3ab9a1cca88fa00037ca283dcf9ee Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Tue, 26 Oct 2021 21:41:03 -0700 Subject: [PATCH] update some Rust deps In particular, retina 0.3.4 no longer pulls in an old nom. --- server/Cargo.lock | 141 ++++++++++++------------------------------- server/Cargo.toml | 2 +- server/db/Cargo.toml | 4 +- 3 files changed, 41 insertions(+), 106 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 1fa9f42..e76eef7 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -161,18 +161,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "blake2-rfc" version = "0.2.18" @@ -196,9 +184,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd555c66291d5f836dbb6883b48660ece810fe25a31f3bdfb911945dff2691f" +checksum = "2607a74355ce2e252d0c483b2d8a348e1bba36036e786ccc2dcd777213c86ffd" dependencies = [ "arrayref", "arrayvec 0.7.1", @@ -647,12 +635,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3958af68a31b1d1384d3f39b6aa33eb14b6009065b5ca305ddd9712a4237124f" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "futures" version = "0.3.17" @@ -787,9 +769,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "h2" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -881,9 +863,9 @@ dependencies = [ [[package]] name = "http-auth" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805afa6c41edf02ff4643e6672810974a83c2d866be06e0c377e1789084f6a7e" +checksum = "c1df750a5b554adc1530f1c97c62931795c6e3e41fc81ac1a303516c6fb91a5d" dependencies = [ "base64", "digest", @@ -896,9 +878,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -942,9 +924,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "hyper" -version = "0.14.13" +version = "0.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" +checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" dependencies = [ "bytes", "futures-channel", @@ -1036,24 +1018,11 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec 0.5.2", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" +checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" [[package]] name = "libpasta" @@ -1202,7 +1171,7 @@ dependencies = [ "lazy_static", "libc", "log", - "nom 7.0.0", + "nom", "parking_lot", "serde", "serde_json", @@ -1290,7 +1259,7 @@ dependencies = [ "moonfire-ffmpeg", "mylog", "nix", - "nom 7.0.0", + "nom", "num-rational 0.4.0", "parking_lot", "protobuf", @@ -1370,19 +1339,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.0.0" @@ -1489,9 +1445,9 @@ dependencies = [ [[package]] name = "object" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c821014c18301591b89b843809ef953af9e3df0496c232d5c0611b0a52aac363" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] @@ -1613,15 +1569,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" [[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "pretty-hex" @@ -1691,30 +1647,33 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] [[package]] name = "protobuf" -version = "3.0.0-pre" -source = "git+https://github.com/stepancheg/rust-protobuf#b3fe22932968995779e4046189becdf7be82ba1d" +version = "3.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "179dfed5ac5d90df13ede91b3035443ec07e0ec964b86afb10700597b5f990bc" [[package]] name = "protobuf-codegen" -version = "3.0.0-pre" -source = "git+https://github.com/stepancheg/rust-protobuf#b3fe22932968995779e4046189becdf7be82ba1d" +version = "3.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb8c094d784e68c4f5453ebbebb95a3fc95dfa5953e41b2bd0a865219622b130" dependencies = [ "protobuf", ] [[package]] name = "protobuf-codegen-pure" -version = "3.0.0-pre" -source = "git+https://github.com/stepancheg/rust-protobuf#b3fe22932968995779e4046189becdf7be82ba1d" +version = "3.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9fc71f4834992ad1f156d585bda2bc397c9b2f8e7d8231142e051798dc538a" dependencies = [ "protobuf", "protobuf-codegen", @@ -1729,12 +1688,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" version = "0.8.4" @@ -1874,9 +1827,9 @@ dependencies = [ [[package]] name = "retina" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99806071cb433bda0abe688798940f64ea8412482c4049e27b924e4d78675c9a" +checksum = "fff0d27b2637d691ead29895d151928ee6a569fef5788c3f0712cd624bf24d70" dependencies = [ "base64", "bitreader", @@ -1945,12 +1898,12 @@ checksum = "d4ed274a5b3d36c4434cff6a4de1b42f43e64ae326b1cfa72d13d9037a314355" [[package]] name = "rtsp-types" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e677628cb208d61181b19f9b0b01efd7fce158bfba1bcb6e57e00fda291d6d" +checksum = "7b668122d4d00c479c08fb2a0a253669832606ccca80832a6b99bb5288ab4f75" dependencies = [ "cookie-factory", - "nom 6.1.2", + "nom", "tinyvec", "url", ] @@ -2199,12 +2152,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.9.3" @@ -2243,9 +2190,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -2270,12 +2217,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.2.0" @@ -2752,12 +2693,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "xi-unicode" version = "0.3.0" diff --git a/server/Cargo.toml b/server/Cargo.toml index f9ace4b..d7e0765 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -44,7 +44,7 @@ mylog = { git = "https://github.com/scottlamb/mylog" } nix = "0.23.0" nom = "7.0.0" parking_lot = { version = "0.11.1", features = [] } -protobuf = { git = "https://github.com/stepancheg/rust-protobuf" } +protobuf = "3.0.0-alpha.1" reffers = "0.6.0" retina = "0.3.3" ring = "0.16.2" diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml index a00b887..bbe0cbe 100644 --- a/server/db/Cargo.toml +++ b/server/db/Cargo.toml @@ -34,7 +34,7 @@ odds = { version = "0.4.0", features = ["std-vec"] } parking_lot = { version = "0.11.1", features = [] } pretty-hex = "0.2.1" prettydiff = { git = "https://github.com/scottlamb/prettydiff", branch = "pr-update-deps" } -protobuf = { git = "https://github.com/stepancheg/rust-protobuf" } +protobuf = "3.0.0-alpha.1" ring = "0.16.2" rusqlite = "0.26.1" serde = { version = "1.0", features = ["derive"] } @@ -48,4 +48,4 @@ uuid = { version = "0.8", features = ["serde", "std", "v4"] } itertools = "0.10.0" [build-dependencies] -protobuf-codegen-pure = { git = "https://github.com/stepancheg/rust-protobuf" } +protobuf-codegen-pure = "3.0.0-alpha.1"