From fed0c859c82de42a2b5d6e858b55c23afca98bb3 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Fri, 21 May 2021 13:35:52 +0900 Subject: [PATCH] meta: cargo update & fmt --- Cargo.lock | 8 ++++---- client/src/main.rs | 4 +--- server/src/main.rs | 11 ++++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a7173d..6238994 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", "libc", @@ -728,9 +728,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] diff --git a/client/src/main.rs b/client/src/main.rs index 7d51aaa..d79cfd5 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -362,9 +362,7 @@ fn redeem_invite( target_conf.to_string_lossy().yellow() ); - log::info!( - "Changing keys and waiting for server's WireGuard interface to transition.", - ); + log::info!("Changing keys and waiting for server's WireGuard interface to transition.",); DeviceUpdate::new() .set_private_key(keypair.private) .apply(&iface, network.backend)?; diff --git a/server/src/main.rs b/server/src/main.rs index 07a3e9a..acdf028 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -6,7 +6,9 @@ use ipnetwork::IpNetwork; use parking_lot::{Mutex, RwLock}; use rusqlite::Connection; use serde::{Deserialize, Serialize}; -use shared::{AddCidrOpts, DeleteCidrOpts, AddPeerOpts, IoErrorContext, NetworkOpt, INNERNET_PUBKEY_HEADER}; +use shared::{ + AddCidrOpts, AddPeerOpts, DeleteCidrOpts, IoErrorContext, NetworkOpt, INNERNET_PUBKEY_HEADER, +}; use std::{ collections::{HashMap, VecDeque}, convert::TryInto, @@ -93,7 +95,6 @@ enum Command { #[structopt(flatten)] args: DeleteCidrOpts, }, - } pub type Db = Arc>; @@ -327,7 +328,11 @@ fn add_cidr( Ok(()) } -fn delete_cidr(interface: &InterfaceName, conf: &ServerConfig, args: DeleteCidrOpts) -> Result<(), Error> { +fn delete_cidr( + interface: &InterfaceName, + conf: &ServerConfig, + args: DeleteCidrOpts, +) -> Result<(), Error> { println!("Fetching eligible CIDRs"); let conn = open_database_connection(interface, conf)?; let cidrs = DatabaseCidr::list(&conn)?;