Bump deps

Cargo.lock

@@ -420,6 +420,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -565,9 +574,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.5"
+version = "3.0.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
+checksum = "79b70f999da60e6619a29b131739d2211ed4d4301f40372e94a8081422e9d6c7"
 dependencies = [
  "atty",
  "bitflags",
@@ -579,14 +588,13 @@ dependencies = [
  "termcolor",
  "terminal_size",
  "textwrap 0.14.2",
- "unicase",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.5"
+version = "3.0.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
+checksum = "fe8c0f28022faaef0387fa54f8e33fee22b804a88bbd91303197da2ff8ca6a5d"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -597,11 +605,11 @@ dependencies = [
 
 [[package]]
 name = "clap_generate"
-version = "3.0.0-beta.5"
+version = "3.0.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "097ab5db1c3417442270cd57c8dd39f6c3114d3ce09d595f9efddbb1fcfaa799"
+checksum = "9c1f113bec1988b503f7a79f23e31ca6006aa25a9a9a0f49105110f1d336464d"
 dependencies = [
- "clap 3.0.0-beta.5",
+ "clap 3.0.0-rc.0",
 ]
 
 [[package]]
@@ -661,6 +669,15 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "ctor"
 version = "0.1.21"
@@ -705,6 +722,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d"
+dependencies = [
+ "block-buffer 0.10.0",
+ "crypto-common",
+ "generic-array",
+]
+
 [[package]]
 name = "discard"
 version = "1.0.4"
@@ -1392,7 +1420,7 @@ dependencies = [
  "bytesize",
  "chrono",
  "chrono-humanize",
- "clap 3.0.0-beta.5",
+ "clap 3.0.0-rc.0",
  "clap_generate",
  "futures",
  "get_if_addrs",
@@ -1556,9 +1584,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "os_str_bytes"
-version = "4.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
 dependencies = [
  "memchr",
 ]
@@ -2263,10 +2291,10 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if",
  "cpufeatures",
- "digest",
+ "digest 0.9.0",
  "opaque-debug",
 ]
 
@@ -2278,15 +2306,13 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "sha2"
-version = "0.9.8"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6"
 dependencies = [
- "block-buffer",
  "cfg-if",
  "cpufeatures",
- "digest",
- "opaque-debug",
+ "digest 0.10.0",
 ]
 
 [[package]]
@@ -2539,7 +2565,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
 dependencies = [
  "terminal_size",
- "unicode-width",
 ]
 
 [[package]]

Cargo.toml

@@ -29,8 +29,8 @@ port_check = "0.1"
 bytesize = "1"
 nanoid = "0.4"
 alphanumeric-sort = "1"
-clap = { version = "3.0.0-beta.5", features = ["wrap_help"] }
-clap_generate = "3.0.0-beta.5"
+clap = { version = "3.0.0-rc.0", features = ["derive", "cargo", "wrap_help"] }
+clap_generate = "3.0.0-rc.0"
 chrono = "0.4"
 chrono-humanize = "0.2"
 serde = { version = "1", features = ["derive"] }
@@ -42,7 +42,7 @@ anyhow = "1"
 log = "0.4"
 strum = "0.23"
 strum_macros = "0.23"
-sha2 = "0.9"
+sha2 = "0.10"
 hex = "0.4"
 zip = "0.5.11"
 qrcodegen = "1"

src/args.rs

@@ -78,7 +78,7 @@ pub struct CliArgs {
         long = "color-scheme",
         default_value = "squirrel",
         possible_values = &*renderer::THEME_SLUGS,
-        case_insensitive = true,
+        ignore_case = true,
     )]
     pub color_scheme: String,
 
@@ -88,7 +88,7 @@ pub struct CliArgs {
         long = "color-scheme-dark",
         default_value = "archlinux",
         possible_values = &*renderer::THEME_SLUGS,
-        case_insensitive = true,
+        ignore_case = true,
     )]
     pub color_scheme_dark: String,
 

src/renderer.rs

@@ -578,7 +578,7 @@ pub fn render_error(
                         p { (error) }
                     }
                     // WARN don't expose random route!
-                    @if !conf.random_route.is_some() {
+                    @if conf.random_route.is_none() {
                         div.error-nav {
                             a.error-back href=(return_address) {
                                 "Go back to file listing"

tests/cli.rs

@@ -32,7 +32,7 @@ fn version_shows() -> Result<(), Error> {
 #[test]
 /// Print completions and exit.
 fn print_completions() -> Result<(), Error> {
-    for shell in Shell::arg_values() {
+    for shell in Shell::possible_values() {
         Command::cargo_bin("miniserve")?
             .arg("--print-completions")
             .arg(shell.get_name())