diff --git a/launchdarkly-server-sdk/src/client.rs b/launchdarkly-server-sdk/src/client.rs index bd3d6d9..b17918f 100644 --- a/launchdarkly-server-sdk/src/client.rs +++ b/launchdarkly-server-sdk/src/client.rs @@ -294,10 +294,7 @@ impl Client { } let initialized = tokio::time::timeout(timeout, self.initialized_async_internal()).await; - match initialized { - Ok(result) => Some(result), - Err(_) => None, - } + initialized.ok() } async fn initialized_async_internal(&self) -> bool { diff --git a/launchdarkly-server-sdk/src/config.rs b/launchdarkly-server-sdk/src/config.rs index e264bff..8c0cd4d 100644 --- a/launchdarkly-server-sdk/src/config.rs +++ b/launchdarkly-server-sdk/src/config.rs @@ -142,17 +142,17 @@ impl Config { } /// Returns the DataStoreFactory - pub fn data_store_builder(&self) -> &(dyn DataStoreFactory) { + pub fn data_store_builder(&self) -> &dyn DataStoreFactory { self.data_store_builder.borrow() } /// Returns the DataSourceFactory - pub fn data_source_builder(&self) -> &(dyn DataSourceFactory) { + pub fn data_source_builder(&self) -> &dyn DataSourceFactory { self.data_source_builder.borrow() } /// Returns the EventProcessorFactory - pub fn event_processor_builder(&self) -> &(dyn EventProcessorFactory) { + pub fn event_processor_builder(&self) -> &dyn EventProcessorFactory { self.event_processor_builder.borrow() } diff --git a/launchdarkly-server-sdk/src/data_source.rs b/launchdarkly-server-sdk/src/data_source.rs index 55c786f..cdd84ef 100644 --- a/launchdarkly-server-sdk/src/data_source.rs +++ b/launchdarkly-server-sdk/src/data_source.rs @@ -73,6 +73,7 @@ pub struct StreamingDataSource { } impl StreamingDataSource { + #[allow(clippy::result_large_err)] pub fn new( base_url: &str, sdk_key: &str, diff --git a/launchdarkly-server-sdk/src/events/sender.rs b/launchdarkly-server-sdk/src/events/sender.rs index f8b6a54..551d361 100644 --- a/launchdarkly-server-sdk/src/events/sender.rs +++ b/launchdarkly-server-sdk/src/events/sender.rs @@ -34,7 +34,7 @@ pub trait EventSender: Send + Sync { &self, events: Vec, result_tx: Sender, - ) -> BoxFuture<()>; + ) -> BoxFuture<'_, ()>; } #[derive(Clone)] @@ -99,7 +99,7 @@ where &self, events: Vec, result_tx: Sender, - ) -> BoxFuture<()> { + ) -> BoxFuture<'_, ()> { Box::pin(async move { let uuid = Uuid::new_v4(); diff --git a/launchdarkly-server-sdk/src/feature_requester.rs b/launchdarkly-server-sdk/src/feature_requester.rs index e435036..42719e7 100644 --- a/launchdarkly-server-sdk/src/feature_requester.rs +++ b/launchdarkly-server-sdk/src/feature_requester.rs @@ -17,7 +17,7 @@ pub enum FeatureRequesterError { struct CachedEntry(AllData, String); pub trait FeatureRequester: Send { - fn get_all(&mut self) -> BoxFuture, FeatureRequesterError>>; + fn get_all(&mut self) -> BoxFuture<'_, Result, FeatureRequesterError>>; } pub struct HyperFeatureRequester { @@ -49,7 +49,7 @@ impl FeatureRequester for HyperFeatureRequester where C: hyper::client::connect::Connect + Clone + Send + Sync + 'static, { - fn get_all(&mut self) -> BoxFuture, FeatureRequesterError>> { + fn get_all(&mut self) -> BoxFuture<'_, Result, FeatureRequesterError>> { Box::pin(async { let uri = self.url.clone(); let key = self.sdk_key.clone();