feat: remove unnecessary clones

Remove unnecessary clones when calling get_key
ScuffleTV · Jul 7, 2023 · 2701bfb · 2701bfb
1 parent 96c70e4
commit 2701bfb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/config/config/src/lib.rs b/config/config/src/lib.rs
@@ -70,7 +70,7 @@ pub enum ParseError {
 }
 
 pub trait Source<C: Config> {
-    fn get_key(&self, path: KeyPath) -> Result<Option<Value>>;
+    fn get_key(&self, path: &KeyPath) -> Result<Option<Value>>;
 }
 
 /// You don't need to implemented this trait manually.
@@ -186,7 +186,7 @@ impl<C: Config> ConfigBuilder<C> {
         Ok(self
             .sources
             .iter()
-            .map(|s| s.get_key(key_path.clone()))
+            .map(|s| s.get_key(&key_path))
             .collect::<Result<Vec<_>>>()?
             .into_iter()
             .flatten()

diff --git a/config/config/src/sources/cli.rs b/config/config/src/sources/cli.rs
@@ -439,7 +439,7 @@ impl<C: Config> CliSource<C> {
 }
 
 impl<C: Config> Source<C> for CliSource<C> {
-    fn get_key(&self, path: KeyPath) -> Result<Option<Value>> {
+    fn get_key(&self, path: &KeyPath) -> Result<Option<Value>> {
         utils::get_key(&self.value, path)
     }
 }
diff --git a/config/config/src/sources/env.rs b/config/config/src/sources/env.rs
@@ -142,7 +142,7 @@ fn parse_to_value(key_type: KeyType, s: &str) -> Result<Value> {
 }
 
 impl<C: Config> Source<C> for EnvSource<C> {
-    fn get_key(&self, path: KeyPath) -> Result<Option<Value>> {
+    fn get_key(&self, path: &KeyPath) -> Result<Option<Value>> {
         utils::get_key(&self.value, path)
     }
 }
diff --git a/config/config/src/sources/file/mod.rs b/config/config/src/sources/file/mod.rs
@@ -83,7 +83,7 @@ impl<C: Config> FileSource<C> {
 }
 
 impl<C: Config> Source<C> for FileSource<C> {
-    fn get_key(&self, path: KeyPath) -> Result<Option<Value>> {
+    fn get_key(&self, path: &KeyPath) -> Result<Option<Value>> {
         utils::get_key(&self.content, path)
     }
 }
diff --git a/config/config/src/sources/utils.rs b/config/config/src/sources/utils.rs
@@ -2,14 +2,14 @@ use serde_value::Value;
 
 use crate::{KeyPath, Result};
 
-pub fn get_key(mut current: &Value, path: KeyPath) -> Result<Option<Value>> {
-    for segment in path.clone() {
+pub fn get_key(mut current: &Value, path: &KeyPath) -> Result<Option<Value>> {
+    for segment in path {
         let Value::Map(map) = current else {
             // Trying to access a field on a non-map type
             // I'm not sure if we should return an error here
             panic!("Trying to access a field on a non-map type: {}, {:#?}", path, current);
         };
-        let Some(value) = map.get(&Value::String(segment)) else {
+        let Some(value) = map.get(&Value::String(segment.clone())) else {
             return Ok(None);
         };
 

diff --git a/config/config/src/tests.rs b/config/config/src/tests.rs
@@ -56,7 +56,7 @@ fn env() {
     std::env::set_var("SCUF_ENABLED", "true");
     let config = sources::EnvSource::<DummyConfig>::with_prefix("SCUF").unwrap();
     assert_eq!(
-        config.get_key("enabled".into()).unwrap().unwrap(),
+        config.get_key(&"enabled".into()).unwrap().unwrap(),
         Value::Bool(true),
     );
 
@@ -65,7 +65,7 @@ fn env() {
     std::env::set_var("LOGGING__JSON", "false");
     let config = sources::EnvSource::<DummyConfig>::with_joiner(None, "__").unwrap();
     assert_eq!(
-        config.get_key("logging.json".into()).unwrap().unwrap(),
+        config.get_key(&"logging.json".into()).unwrap().unwrap(),
         Value::Bool(false),
     );
 
@@ -74,7 +74,7 @@ fn env() {
     std::env::set_var("LOGGING_JSON", "true");
     let config = sources::EnvSource::<DummyConfig>::new().unwrap();
     assert_eq!(
-        config.get_key("logging.json".into()).unwrap().unwrap(),
+        config.get_key(&"logging.json".into()).unwrap().unwrap(),
         Value::Bool(true),
     );
 }
@@ -87,10 +87,10 @@ fn file() {
     "#;
     let config = sources::FileSource::<DummyConfig>::toml(data).unwrap();
     assert_eq!(
-        config.get_key("test.key".into()).unwrap().unwrap(),
+        config.get_key(&"test.key".into()).unwrap().unwrap(),
         Value::String("test_value".to_string())
     );
-    assert_eq!(config.get_key("test.not_defined".into()).unwrap(), None);
+    assert_eq!(config.get_key(&"test.not_defined".into()).unwrap(), None);
 }
 
 #[test]
@@ -108,15 +108,15 @@ fn cli() {
         ]);
     let cli = sources::CliSource::<DummyConfig>::with_matches(matches).unwrap();
     assert_eq!(
-        cli.get_key("enabled".into()).unwrap().unwrap(),
+        cli.get_key(&"enabled".into()).unwrap().unwrap(),
         Value::Bool(true),
     );
     assert_eq!(
-        cli.get_key("logging.level".into()).unwrap().unwrap(),
+        cli.get_key(&"logging.level".into()).unwrap().unwrap(),
         Value::String("INFO".to_string()),
     );
     assert_eq!(
-        cli.get_key("logging.json".into()).unwrap().unwrap(),
+        cli.get_key(&"logging.json".into()).unwrap().unwrap(),
         Value::Bool(false),
     );
 }