diff --git a/Cargo.lock b/Cargo.lock index 5a1ab13..c7149f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,9 +63,9 @@ dependencies = [ [[package]] name = "async-recursion" -version = "0.3.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ "proc-macro2", "quote", @@ -171,13 +171,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.34.0" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "f6f34b09b9ee8c7c7b400fe2f8df39cafc9538b03d6ba7f4ae13e4cb90bfbb7d" dependencies = [ "bitflags", + "indexmap", + "os_str_bytes", "textwrap", - "unicode-width", ] [[package]] @@ -554,7 +555,7 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libreddit" -version = "0.21.5" +version = "0.21.6" dependencies = [ "askama", "async-recursion", @@ -673,6 +674,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + [[package]] name = "parking" version = "2.0.0" @@ -877,18 +887,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -897,9 +907,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa 1.0.1", "ryu", @@ -962,12 +972,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" [[package]] name = "time" @@ -1103,12 +1110,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index abdf566..97950af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,23 +3,23 @@ name = "libreddit" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://github.com/spikecodes/libreddit" -version = "0.21.5" +version = "0.21.6" authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"] edition = "2021" [dependencies] askama = { version = "0.11.0", default-features = false } -async-recursion = "0.3.2" +async-recursion = "1.0.0" cached = "0.26.2" -clap = { version = "2.34.0", default-features = false } +clap = { version = "3.0.5", default-features = false, features = ["std"] } regex = "1.5.4" -serde = { version = "1.0.132", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } cookie = "0.16.0" futures-lite = "1.12.0" hyper = { version = "0.14.16", features = ["full"] } hyper-rustls = "0.23.0" route-recognizer = "0.3.1" -serde_json = "1.0.73" +serde_json = "1.0.74" tokio = { version = "1.15.0", features = ["full"] } time = "0.3.5" url = "2.2.2" diff --git a/src/main.rs b/src/main.rs index 922f35f..206d5cf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -91,15 +91,15 @@ async fn main() { .version(env!("CARGO_PKG_VERSION")) .about("Private front-end for Reddit written in Rust ") .arg( - Arg::with_name("redirect-https") - .short("r") + Arg::new("redirect-https") + .short('r') .long("redirect-https") .help("Redirect all HTTP requests to HTTPS (no longer functional)") .takes_value(false), ) .arg( - Arg::with_name("address") - .short("a") + Arg::new("address") + .short('a') .long("address") .value_name("ADDRESS") .help("Sets address to listen on") @@ -107,8 +107,8 @@ async fn main() { .takes_value(true), ) .arg( - Arg::with_name("port") - .short("p") + Arg::new("port") + .short('p') .long("port") .value_name("PORT") .help("Port to listen on") @@ -116,8 +116,8 @@ async fn main() { .takes_value(true), ) .arg( - Arg::with_name("hsts") - .short("H") + Arg::new("hsts") + .short('H') .long("hsts") .value_name("EXPIRE_TIME") .help("HSTS header to tell browsers that this site should only be accessed over HTTPS")