clippy

eclipse-ibeji · Feb 16, 2024 · d0bf143 · d0bf143
1 parent 1a56c0e
commit d0bf143
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/...gital_twin/in_memory_mock_digital_twin_adapter/src/in_memory_mock_digital_twin_adapter.rs b/...gital_twin/in_memory_mock_digital_twin_adapter/src/in_memory_mock_digital_twin_adapter.rs
@@ -92,7 +92,7 @@ mod in_memory_mock_digital_twin_adapter_tests {
         impl ServiceDiscoveryAdapterSelector for ServiceDiscoveryAdapterSelectorImpl {
             fn register(&mut self, adapter: Box<dyn ServiceDiscoveryAdapter + Send + Sync>) -> Result<(), ServiceDiscoveryAdapterError>;
 
-            async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError>;
+            async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError>;
         }
     }
 

diff --git a/...ce_discovery/chariott_service_discovery_adapter/src/chariott_service_discovery_adapter.rs b/...ce_discovery/chariott_service_discovery_adapter/src/chariott_service_discovery_adapter.rs
@@ -68,7 +68,7 @@ impl ServiceDiscoveryAdapter for ChariottServiceDiscoveryAdapter {
     ///
     /// # Arguments
     /// - `id`: the service identifier
-    async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError> {
+    async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError> {
         let pieces = id.split('/').collect::<Vec<_>>();
         if pieces.len() != 3 {
             return Err(ServiceDiscoveryAdapterErrorKind::InvalidId.into());

diff --git a/...rs/service_discovery/file_service_discovery_adapter/src/file_service_discovery_adapter.rs b/...rs/service_discovery/file_service_discovery_adapter/src/file_service_discovery_adapter.rs
@@ -43,7 +43,7 @@ impl ServiceDiscoveryAdapter for FileServiceDiscoveryAdapter {
     ///
     /// # Arguments
     /// - `id`: the service identifier
-    async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError> {
+    async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError> {
         self.config
             .services
             .get(id)

diff --git a/common/src/service_discovery_adapter.rs b/common/src/service_discovery_adapter.rs
@@ -19,7 +19,7 @@ pub trait ServiceDiscoveryAdapter {
     ///
     /// # Arguments
     /// - `id`: the service identifier
-    async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError>;
+    async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError>;
 }
 
 proc_macros::error! {

diff --git a/common/src/service_discovery_adapter_selector.rs b/common/src/service_discovery_adapter_selector.rs
@@ -22,5 +22,5 @@ pub trait ServiceDiscoveryAdapterSelector {
     ///
     /// # Arguments
     /// - `id`: the service identifier
-    async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError>;
+    async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError>;
 }
diff --git a/freyja/src/service_discovery_adapter_selector_impl.rs b/freyja/src/service_discovery_adapter_selector_impl.rs
@@ -46,7 +46,7 @@ impl ServiceDiscoveryAdapterSelector for ServiceDiscoveryAdapterSelectorImpl {
     ///
     /// # Arguments
     /// - `id`: the service identifier
-    async fn get_service_uri(&self, id: &String) -> Result<String, ServiceDiscoveryAdapterError> {
+    async fn get_service_uri<'a>(&self, id: &'a str) -> Result<String, ServiceDiscoveryAdapterError> {
         for adapter in self.adapters.iter() {
             log::debug!(
                 "Attempting to discover uri for service {id} from adapter {}...",

diff --git a/proc_macros/src/freyja_main/parse.rs b/proc_macros/src/freyja_main/parse.rs
@@ -117,7 +117,7 @@ mod freyja_main_parse_tests {
             output.service_discovery_adapter_types.len(),
             service_discovery_idents.len()
         );
-        for i in 0..service_discovery_idents.len() {
+        for (i, _) in service_discovery_idents.iter().enumerate() {
             assert_eq!(
                 output.service_discovery_adapter_types[i],
                 service_discovery_idents[i]
@@ -142,7 +142,7 @@ mod freyja_main_parse_tests {
             factory_idents.len()
         );
 
-        for i in 0..factory_idents.len() {
+        for (i, _) in factory_idents.iter().enumerate() {
             assert_eq!(output.service_discovery_adapter_types[i], factory_idents[i]);
         }
     }