Merge pull request #3047 from lann/app-arc-locked

app: Wrap inner LockedApp in Arc

Author: lann

crates/app/src/lib.rs

@@ -7,6 +7,7 @@
 #![deny(missing_docs)]
 
 use std::collections::HashSet;
+use std::sync::Arc;
 
 use serde::Deserialize;
 use serde_json::Value;
@@ -37,7 +38,7 @@ pub type ValidatorFn = dyn Fn(&App, &[&str]) -> anyhow::Result<()>;
 #[derive(Debug, Clone)]
 pub struct App {
     id: String,
-    locked: LockedApp,
+    locked: Arc<LockedApp>,
 }
 
 impl App {
@@ -46,7 +47,7 @@ impl App {
     pub fn new(id: impl Into<String>, locked: LockedApp) -> Self {
         Self {
             id: id.into(),
-            locked,
+            locked: Arc::new(locked),
         }
     }
 
@@ -170,7 +171,7 @@ impl App {
     /// Scrubs the locked app to only contain the given list of components
     /// Introspects the LockedApp to find and selectively retain the triggers that correspond to those components
     fn retain_components(
-        mut self,
+        self,
         retained_components: &[&str],
         validators: &[&ValidatorFn],
     ) -> Result<LockedApp> {
@@ -187,11 +188,10 @@ impl App {
                 _ => None,
             })
             .collect();
-        self.locked
-            .components
-            .retain(|c| component_ids.contains(&c.id));
-        self.locked.triggers.retain(|t| trigger_ids.contains(&t.id));
-        Ok(self.locked)
+        let mut locked = Arc::unwrap_or_clone(self.locked);
+        locked.components.retain(|c| component_ids.contains(&c.id));
+        locked.triggers.retain(|t| trigger_ids.contains(&t.id));
+        Ok(locked)
     }
 
     /// Validates that all components specified to be retained actually exist in the app