MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-14 00:09:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

update indexmap

Browse Source
This commit is contained in:
Scott Lamb 2024-01-06 11:54:33 -08:00
parent 86816e862a
commit 4d4d786cde
2 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
server/Cargo.lock generated
View File

@ -17,17 +17,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
dependencies = [
"getrandom",
"once_cell",
"version_check",
]
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.7" version = "0.8.7"
@ -50,6 +39,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "allocator-api2"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]] [[package]]
name = "android-tzdata" name = "android-tzdata"
version = "0.1.1" version = "0.1.1"
@ -343,7 +338,7 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash",
"cfg-if", "cfg-if",
"crossbeam-channel", "crossbeam-channel",
"cursive_core", "cursive_core",
@ -362,7 +357,7 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash",
"crossbeam-channel", "crossbeam-channel",
"enum-map", "enum-map",
"enumset", "enumset",
@ -498,6 +493,12 @@ dependencies = [
"syn 2.0.48", "syn 2.0.48",
] ]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.8" version = "0.3.8"
@ -695,9 +696,9 @@ dependencies = [
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.3.21" version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -727,18 +728,19 @@ dependencies = [
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.3" version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [ dependencies = [
"ahash 0.7.7", "ahash",
"allocator-api2",
] ]
[[package]] [[package]]
name = "hashlink" name = "hashlink"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [ dependencies = [
"hashbrown", "hashbrown",
] ]
@ -916,11 +918,11 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.9.3" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [ dependencies = [
"autocfg", "equivalent",
"hashbrown", "hashbrown",
] ]
@ -1103,7 +1105,7 @@ dependencies = [
name = "moonfire-base" name = "moonfire-base"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash",
"chrono", "chrono",
"coded", "coded",
"futures", "futures",
@ -1140,7 +1142,7 @@ dependencies = [
"num-rational", "num-rational",
"odds", "odds",
"pretty-hex", "pretty-hex",
"protobuf", "protobuf 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf-codegen", "protobuf-codegen",
"ring", "ring",
"rusqlite", "rusqlite",
@ -1161,7 +1163,7 @@ dependencies = [
name = "moonfire-nvr" name = "moonfire-nvr"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash",
"base64", "base64",
"blake3", "blake3",
"bpaf", "bpaf",
@ -1188,7 +1190,7 @@ dependencies = [
"nom", "nom",
"num-rational", "num-rational",
"password-hash", "password-hash",
"protobuf", "protobuf 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"reffers", "reffers",
"reqwest", "reqwest",
"retina", "retina",
@ -1266,15 +1268,6 @@ dependencies = [
"minimal-lexical", "minimal-lexical",
] ]
[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "nu-ansi-term" name = "nu-ansi-term"
version = "0.46.0" version = "0.46.0"
@ -1532,19 +1525,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"protobuf-support", "protobuf-support 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror",
]
[[package]]
name = "protobuf"
version = "3.3.0"
source = "git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38#a61e09785c957eb9a183d129b426710146bfde38"
dependencies = [
"once_cell",
"protobuf-support 3.3.0 (git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38)",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "protobuf-codegen" name = "protobuf-codegen"
version = "3.3.0" version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38#a61e09785c957eb9a183d129b426710146bfde38"
checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"once_cell", "once_cell",
"protobuf", "protobuf 3.3.0 (git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38)",
"protobuf-parse", "protobuf-parse",
"regex", "regex",
"tempfile", "tempfile",
@ -1554,14 +1556,13 @@ dependencies = [
[[package]] [[package]]
name = "protobuf-parse" name = "protobuf-parse"
version = "3.3.0" version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38#a61e09785c957eb9a183d129b426710146bfde38"
checksum = "77d6fbd6697c9e531873e81cec565a85e226b99a0f10e1acc079be057fe2fcba"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
"log", "log",
"protobuf", "protobuf 3.3.0 (git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38)",
"protobuf-support", "protobuf-support 3.3.0 (git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38)",
"tempfile", "tempfile",
"thiserror", "thiserror",
"which", "which",
@ -1576,6 +1577,14 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "protobuf-support"
version = "3.3.0"
source = "git+https://github.com/scottlamb/rust-protobuf.git?rev=a61e09785c957eb9a183d129b426710146bfde38#a61e09785c957eb9a183d129b426710146bfde38"
dependencies = [
"thiserror",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.35" version = "1.0.35"
@ -2257,9 +2266,9 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.6.0" version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
@ -2269,24 +2278,24 @@ dependencies = [
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.5.1" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.18.1" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"nom8",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow",
] ]
[[package]] [[package]]
@ -2827,6 +2836,15 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
version = "0.5.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "winreg" name = "winreg"
version = "0.50.0" version = "0.50.0"

8
server/Cargo.toml
View File

@ -67,7 +67,7 @@ time = "0.1"
tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "signal", "sync", "time"] } tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = "0.1.5" tokio-stream = "0.1.5"
tokio-tungstenite = "0.20.0" tokio-tungstenite = "0.20.0"
toml = "0.6" toml = "0.8"
tracing = { workspace = true } tracing = { workspace = true }
tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }
tracing-core = "0.1.30" tracing-core = "0.1.30"
@ -111,5 +111,9 @@ lto = true
debug = 1 debug = 1
[patch.crates-io] [patch.crates-io]
# update to indexmap 2
protobuf-codegen = { git = "https://github.com/scottlamb/rust-protobuf.git", rev = "a61e09785c957eb9a183d129b426710146bfde38" }
protobuf-parse = { git = "https://github.com/scottlamb/rust-protobuf.git", rev = "a61e09785c957eb9a183d129b426710146bfde38" }
# This version uses fallible-iterator v0.3 (same one rusqlite 0.30 uses) and hasn't been released yet. # This version uses fallible-iterator v0.3 (same one rusqlite 0.30 uses) and hasn't been released yet.
sdp-types = { git = "https://github.com/sdroege/sdp-types", rev = "e8d0a2c4b8b1fc1ddf1c60a01dc717a2f4e2d514" } sdp-types = { git = "https://github.com/sdroege/sdp-types", rev = "e8d0a2c4b8b1fc1ddf1c60a01dc717a2f4e2d514" }