diff --git a/Cargo.lock b/Cargo.lock index 2592b58e..26668f9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -538,9 +538,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "digest" @@ -1369,6 +1372,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.4.1" @@ -1591,6 +1600,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2276,12 +2291,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2295,10 +2312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/src/api/server.rs b/src/api/server.rs index ae43a5d4..32162121 100644 --- a/src/api/server.rs +++ b/src/api/server.rs @@ -37,7 +37,7 @@ impl LocalServer { pub async fn run(self, shutdown: &triggered::Listener) -> Result { let listen_addr = self.listen_addr; - tracing::Span::current().record("listen", &listen_addr.to_string()); + tracing::Span::current().record("listen", listen_addr.to_string()); info!(listen = %listen_addr, "starting"); TransportServer::builder() .add_service(Server::new(self)) diff --git a/src/base64.rs b/src/base64.rs index daf92444..c907e827 100644 --- a/src/base64.rs +++ b/src/base64.rs @@ -1,16 +1,6 @@ -use base64::{ - engine::general_purpose::{STANDARD, URL_SAFE_NO_PAD}, - Engine, -}; +use base64::{engine::general_purpose::STANDARD, Engine}; pub trait Base64 { - fn to_b64url(&self) -> String - where - Self: AsRef<[u8]>, - { - URL_SAFE_NO_PAD.encode(self.as_ref()) - } - fn to_b64(&self) -> String where Self: AsRef<[u8]>, diff --git a/src/beaconer.rs b/src/beaconer.rs index 1c289e9c..437a7971 100644 --- a/src/beaconer.rs +++ b/src/beaconer.rs @@ -11,7 +11,8 @@ use futures::TryFutureExt; use helium_proto::services::poc_lora::{self, lora_stream_response_v1}; use http::Uri; use std::sync::Arc; -use time::{Duration, Instant, OffsetDateTime}; +use std::time::Instant; +use time::{Duration, OffsetDateTime}; use tracing::{info, warn}; /// Message types that can be sent to `Beaconer`'s inbox. @@ -106,7 +107,7 @@ impl Beaconer { info!("shutting down"); return Ok(()) }, - _ = tokio::time::sleep_until(next_beacon_instant.into_inner().into()) => { + _ = tokio::time::sleep_until(next_beacon_instant.into()) => { // Check if beaconing is enabled and we have valid region params if !self.disabled && self.region_params.check_valid().is_ok() { self.handle_beacon_tick().await;