get_id: Don't clone ID on return

Author: alexdewar

src/id.rs

@@ -84,16 +84,16 @@ pub trait IDCollection<ID: IDLike> {
     /// # Returns
     ///
     /// A copy of the ID in `self`, or an error if not found.
-    fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<ID>;
+    fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<&ID>;
 }
 
 macro_rules! define_id_methods {
     () => {
-        fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<ID> {
+        fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<&ID> {
             let found = self
                 .get(id.borrow())
                 .with_context(|| format!("Unknown ID {id} found"))?;
-            Ok(found.clone())
+            Ok(found)
         }
     };
 }

src/input/agent/search_space.rs

@@ -63,7 +63,7 @@ impl AgentSearchSpaceRaw {
 
         Ok(AgentSearchSpace {
             agent_id: agent_id.clone(),
-            commodity_id,
+            commodity_id: commodity_id.clone(),
             years: year,
             search_space,
         })
@@ -86,7 +86,7 @@ fn parse_search_space_str(
     } else {
         search_space
             .split(';')
-            .map(|id| process_ids.get_id(id.trim()))
+            .map(|id| Ok(process_ids.get_id(id.trim())?.clone()))
             .try_collect()
     }
 }

src/input/asset.rs

@@ -76,9 +76,9 @@ where
         let region_id = region_ids.get_id(&asset.region_id)?;
 
         Asset::new(
-            agent_id,
+            agent_id.clone(),
             Rc::clone(process),
-            region_id,
+            region_id.clone(),
             asset.capacity,
             asset.commission_year,
         )

src/input/process/availability.rs

@@ -111,7 +111,7 @@ where
         // Get process
         let id = process_ids.get_id(&record.process_id)?;
         let process = processes
-            .get(&id)
+            .get(id)
             .with_context(|| format!("Process {id} not found"))?;
 
         // Get regions
@@ -131,7 +131,9 @@ where
         let ts_selection = time_slice_info.get_selection(&record.time_slice)?;
 
         // Insert the energy limit into the map
-        let entry = map.entry(id).or_insert_with(ProcessEnergyLimitsMap::new);
+        let entry = map
+            .entry(id.clone())
+            .or_insert_with(ProcessEnergyLimitsMap::new);
         for (time_slice, ts_length) in time_slice_info.iter_selection(&ts_selection) {
             let bounds = record.to_bounds(ts_length);
 

src/input/process/flow.rs

@@ -84,7 +84,7 @@ where
         // Get process
         let id = process_ids.get_id(&record.process_id)?;
         let process = processes
-            .get(&id)
+            .get(id)
             .with_context(|| format!("Process {id} not found"))?;
 
         // Get regions

src/input/process/parameter.rs

@@ -119,7 +119,7 @@ where
         // Get process
         let id = process_ids.get_id(&param_raw.process_id)?;
         let process = processes
-            .get(&id)
+            .get(id)
             .with_context(|| format!("Process {id} not found"))?;
 
         // Get years

src/region.rs

@@ -32,7 +32,9 @@ pub fn parse_region_str(s: &str, region_ids: &HashSet<RegionID>) -> Result<HashS
         return Ok(region_ids.clone());
     }
 
-    s.split(";").map(|y| region_ids.get_id(y.trim())).collect()
+    s.split(";")
+        .map(|y| Ok(region_ids.get_id(y.trim())?.clone()))
+        .collect()
 }
 
 #[cfg(test)]