From 841e06e35458db1e40e16c72730cd2959cfdc5e6 Mon Sep 17 00:00:00 2001
From: Scott Lamb <slamb@slamb.org>
Date: Mon, 2 May 2022 11:22:14 -0700
Subject: [PATCH] update a few deps

---
 .github/workflows/ci.yml      |   2 +-
 CHANGELOG.md                  |   2 +-
 guide/build.md                |   2 +-
 server/Cargo.lock             | 123 +++++++++++++++++-----------------
 server/Cargo.toml             |   4 +-
 server/db/Cargo.toml          |   4 +-
 server/db/check.rs            |   2 +-
 server/db/db.rs               |   6 +-
 server/db/dir/mod.rs          |   4 +-
 server/db/upgrade/v1_to_v2.rs |   2 +-
 server/db/upgrade/v2_to_v3.rs |   2 +-
 server/db/upgrade/v4_to_v5.rs |   2 +-
 12 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 233ff31..9d26e6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rust ${{ matrix.rust }}
     strategy:
       matrix:
-        rust: [ "stable", "1.57", "nightly" ]
+        rust: [ "stable", "1.60", "nightly" ]
         include:
           - rust: nightly
             extra_args: "--features nightly --benches"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e8cbea..efe7b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Each release is tagged in Git and on the Docker repository
 *   [#219](https://github.com/scottlamb/moonfire-nvr/issues/219): fix
     live stream failing with `ws close: 1006` on URLs with port numbers.
 *   build Docker images with link-time optimization.
-*   bump minimum Rust version to 1.57.
+*   bump minimum Rust version to 1.60.
 
 ## 0.7.4 (2022-04-13)
 
diff --git a/guide/build.md b/guide/build.md
index 0e6cae0..d9f700a 100644
--- a/guide/build.md
+++ b/guide/build.md
@@ -207,7 +207,7 @@ following command:
 $ brew install node
 ```
 
-Next, you need Rust 1.57+ and Cargo. The easiest way to install them is by
+Next, you need Rust 1.60+ and Cargo. The easiest way to install them is by
 following the instructions at [rustup.rs](https://www.rustup.rs/). Avoid
 your Linux distribution's Rust packages, which tend to be too old.
 (At least on Debian-based systems; Arch and Gentoo might be okay.)
diff --git a/server/Cargo.lock b/server/Cargo.lock
index 4e421ea..28fac40 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -28,6 +28,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -125,16 +134,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "constant_time_eq",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
+ "digest",
 ]
 
 [[package]]
@@ -376,22 +376,13 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
 dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer",
  "crypto-common",
  "subtle",
 ]
@@ -724,7 +715,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.3",
+ "digest",
 ]
 
 [[package]]
@@ -740,17 +731,17 @@ dependencies = [
 
 [[package]]
 name = "http-auth"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d3003cd46a8f8da3292b79488bc95917ef8c6cac33b39473e191bbff0dc85d"
+checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850"
 dependencies = [
  "base64",
- "digest 0.9.0",
+ "digest",
  "hex",
  "md-5",
  "memchr",
  "rand",
- "sha2 0.9.9",
+ "sha2",
 ]
 
 [[package]]
@@ -766,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "http-serve"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb663bddc0a96082a0131e22ce74623d85f77b7701dc165139c42cb16452cbe"
+checksum = "496ab5f39096e4c915f167c276aea19521ed862beb50f7d2bc530578535689d7"
 dependencies = [
  "bytes",
  "flate2",
@@ -953,13 +944,11 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "md-5"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
+checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug",
+ "digest",
 ]
 
 [[package]]
@@ -1334,12 +1323,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "owning_ref"
 version = "0.4.1"
@@ -1389,7 +1372,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
 dependencies = [
- "digest 0.10.3",
+ "digest",
 ]
 
 [[package]]
@@ -1483,41 +1466,55 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "3.0.0-alpha.8"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a416d5c5d48e9cec99c6348d72567827a7db92eb9a6dac4c6bbf498c92b5387c"
+checksum = "430ff91293021cc9369e04edced9594c9c7a03760e62afcf98b0f8ad99a56ef7"
 dependencies = [
+ "once_cell",
+ "protobuf-support",
  "thiserror",
 ]
 
 [[package]]
 name = "protobuf-codegen"
-version = "3.0.0-alpha.8"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d49fd0d60dbcca37527ec064c80f00bac163fdd79955674363f3c2fbe09bc0"
+checksum = "f9248f242f2b2915e050852c56058dffe2ea9d71fba735d8eb33be78973b71cd"
 dependencies = [
  "anyhow",
+ "once_cell",
  "protobuf",
  "protobuf-parse",
+ "regex",
  "tempfile",
  "thiserror",
 ]
 
 [[package]]
 name = "protobuf-parse"
-version = "3.0.0-alpha.8"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc005ee4b04f4a8dac9f23d2394541ee85fe7a32fbcd6bb793a3f1f6d184d5cc"
+checksum = "a7aa0f9769c554c90cb1b28592f7efe03ad2540de046dfa21d89155776c27c29"
 dependencies = [
  "anyhow",
  "indexmap",
  "log",
  "protobuf",
+ "protobuf-support",
  "tempfile",
  "thiserror",
  "which",
 ]
 
+[[package]]
+name = "protobuf-support"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9553cd16fcb53a9b33da0735313393ba2697d090ae9af4a96f160992513ce8cb"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.15"
@@ -1590,12 +1587,29 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "regex"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
 [[package]]
 name = "regex-automata"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -1763,7 +1777,7 @@ dependencies = [
  "password-hash",
  "pbkdf2",
  "salsa20",
- "sha2 0.10.2",
+ "sha2",
 ]
 
 [[package]]
@@ -1827,20 +1841,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "digest",
 ]
 
 [[package]]
@@ -1851,7 +1852,7 @@ checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.3",
+ "digest",
 ]
 
 [[package]]
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 21552ee..ed343d0 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Scott Lamb <slamb@slamb.org>"]
 edition = "2018"
 resolver = "2"
 license-file = "../LICENSE.txt"
-rust-version = "1.57"
+rust-version = "1.60"
 
 [features]
 
@@ -45,7 +45,7 @@ nix = "0.23.0"
 nom = "7.0.0"
 parking_lot = "0.12.0"
 password-hash = "0.3.2"
-protobuf = "3.0.0-alpha.1"
+protobuf = "3.0"
 reffers = "0.7.0"
 retina = "0.3.9"
 ring = "0.16.2"
diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml
index 1a3682d..3a12050 100644
--- a/server/db/Cargo.toml
+++ b/server/db/Cargo.toml
@@ -33,7 +33,7 @@ num-rational = { version = "0.4.0", default-features = false, features = ["std"]
 odds = { version = "0.4.0", features = ["std-vec"] }
 parking_lot = "0.12.0"
 pretty-hex = "0.2.1"
-protobuf = "3.0.0-alpha.1"
+protobuf = "3.0"
 ring = "0.16.2"
 rusqlite = "0.27.0"
 scrypt = "0.9.0"
@@ -49,4 +49,4 @@ uuid = { version = "0.8", features = ["serde", "std", "v4"] }
 itertools = "0.10.0"
 
 [build-dependencies]
-protobuf-codegen = "3.0.0-alpha.1"
+protobuf-codegen = "3.0"
diff --git a/server/db/check.rs b/server/db/check.rs
index b65d6e1..e03cd3e 100644
--- a/server/db/check.rs
+++ b/server/db/check.rs
@@ -97,7 +97,7 @@ pub fn run(conn: &mut rusqlite::Connection, opts: &Options) -> Result<i32, Error
             meta.db_uuid.extend_from_slice(&db_uuid.as_bytes()[..]);
             meta.dir_uuid.extend_from_slice(&dir_uuid.0.as_bytes()[..]);
             {
-                let o = meta.last_complete_open.set_default();
+                let o = meta.last_complete_open.mut_or_insert_default();
                 o.id = open_id;
                 o.uuid.extend_from_slice(&open_uuid.0.as_bytes()[..]);
             }
diff --git a/server/db/db.rs b/server/db/db.rs
index 7ef67ba..a3990ae 100644
--- a/server/db/db.rs
+++ b/server/db/db.rs
@@ -352,7 +352,7 @@ impl SampleFileDir {
         meta.db_uuid.extend_from_slice(&db_uuid.as_bytes()[..]);
         meta.dir_uuid.extend_from_slice(&self.uuid.as_bytes()[..]);
         if let Some(o) = self.last_complete_open {
-            let open = meta.last_complete_open.set_default();
+            let open = meta.last_complete_open.mut_or_insert_default();
             open.id = o.id;
             open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
         }
@@ -1182,7 +1182,7 @@ impl LockedDatabase {
             }
             let mut expected_meta = dir.expected_meta(&self.uuid);
             if let Some(o) = self.open.as_ref() {
-                let open = expected_meta.in_progress_open.set_default();
+                let open = expected_meta.in_progress_open.mut_or_insert_default();
                 open.id = o.id;
                 open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
             }
@@ -1753,7 +1753,7 @@ impl LockedDatabase {
         {
             meta.db_uuid.extend_from_slice(&self.uuid.as_bytes()[..]);
             meta.dir_uuid.extend_from_slice(uuid_bytes);
-            let open = meta.in_progress_open.set_default();
+            let open = meta.in_progress_open.mut_or_insert_default();
             open.id = o.id;
             open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
         }
diff --git a/server/db/dir/mod.rs b/server/db/dir/mod.rs
index 4593595..280c70d 100644
--- a/server/db/dir/mod.rs
+++ b/server/db/dir/mod.rs
@@ -403,12 +403,12 @@ mod tests {
         meta.db_uuid.extend_from_slice(fake_uuid);
         meta.dir_uuid.extend_from_slice(fake_uuid);
         {
-            let o = meta.last_complete_open.set_default();
+            let o = meta.last_complete_open.mut_or_insert_default();
             o.id = u32::max_value();
             o.uuid.extend_from_slice(fake_uuid);
         }
         {
-            let o = meta.in_progress_open.set_default();
+            let o = meta.in_progress_open.mut_or_insert_default();
             o.id = u32::max_value();
             o.uuid.extend_from_slice(fake_uuid);
         }
diff --git a/server/db/upgrade/v1_to_v2.rs b/server/db/upgrade/v1_to_v2.rs
index f718c68..233f0f0 100644
--- a/server/db/upgrade/v1_to_v2.rs
+++ b/server/db/upgrade/v1_to_v2.rs
@@ -95,7 +95,7 @@ pub fn run(args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
     {
         meta.db_uuid.extend_from_slice(db_uuid_bytes);
         meta.dir_uuid.extend_from_slice(dir_uuid_bytes);
-        let open = meta.last_complete_open.set_default();
+        let open = meta.last_complete_open.mut_or_insert_default();
         open.id = open_id;
         open.uuid.extend_from_slice(&open_uuid_bytes);
     }
diff --git a/server/db/upgrade/v2_to_v3.rs b/server/db/upgrade/v2_to_v3.rs
index d8f1e1d..db7f4f5 100644
--- a/server/db/upgrade/v2_to_v3.rs
+++ b/server/db/upgrade/v2_to_v3.rs
@@ -46,7 +46,7 @@ fn open_sample_file_dir(tx: &rusqlite::Transaction) -> Result<Arc<dir::SampleFil
     meta.db_uuid.extend_from_slice(&db_uuid.0.as_bytes()[..]);
     meta.dir_uuid.extend_from_slice(&s_uuid.0.as_bytes()[..]);
     {
-        let open = meta.last_complete_open.set_default();
+        let open = meta.last_complete_open.mut_or_insert_default();
         open.id = o_id as u32;
         open.uuid.extend_from_slice(&o_uuid.0.as_bytes()[..]);
     }
diff --git a/server/db/upgrade/v4_to_v5.rs b/server/db/upgrade/v4_to_v5.rs
index 0e7ce7f..9f2a855 100644
--- a/server/db/upgrade/v4_to_v5.rs
+++ b/server/db/upgrade/v4_to_v5.rs
@@ -139,7 +139,7 @@ pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
             .extend_from_slice(&dir_uuid.0.as_bytes()[..]);
         match (open_id, open_uuid) {
             (Some(id), Some(uuid)) => {
-                let mut o = db_meta.last_complete_open.set_default();
+                let mut o = db_meta.last_complete_open.mut_or_insert_default();
                 o.id = id;
                 o.uuid.extend_from_slice(&uuid.0.as_bytes()[..]);
             }