refactor

crates/signed_state/src/checkouts.rs

@@ -1,7 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use std::sync::Arc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use anyhow::Error;
@@ -67,9 +66,9 @@ struct Remembered {
 /// Global store of local-checkout associations and per-checkout statuses.
 pub struct CheckoutsStore {
     /// Checkout paths per announced repository.
-    by_repo: Arc<HashMap<RepoAddr, Vec<PathBuf>>>,
+    by_repo: HashMap<RepoAddr, Vec<PathBuf>>,
     /// Ready-to-contribute statuses of the requested repositories.
-    statuses: Arc<HashMap<RepoAddr, Vec<CheckoutStatus>>>,
+    statuses: HashMap<RepoAddr, Vec<CheckoutStatus>>,
     /// Repositories whose statuses are recomputed on every input change.
     ///
     /// Those are the repository detail panels currently open.
@@ -79,7 +78,7 @@ pub struct CheckoutsStore {
     /// The sidebar rows of the user's own repositories and their detail panels.
     push_requested: HashSet<RepoAddr>,
     /// Ready-to-push statuses of the requested own repositories.
-    push_statuses: Arc<HashMap<RepoAddr, Vec<CheckoutStatus>>>,
+    push_statuses: HashMap<RepoAddr, Vec<CheckoutStatus>>,
     /// Last announced head branch per requested repository.
     ///
     /// A recompute defaults the base the same way.
@@ -129,19 +128,19 @@ impl CheckoutsStore {
                     this.status_requested.clear();
                     this.push_requested.clear();
                     this.requested_head.clear();
-                    this.statuses = Arc::new(HashMap::new());
-                    this.push_statuses = Arc::new(HashMap::new());
+                    this.statuses = HashMap::new();
+                    this.push_statuses = HashMap::new();
                     this.refresh(cx);
                 }
             }));
         }
 
         let mut store = Self {
-            by_repo: Arc::new(HashMap::new()),
-            statuses: Arc::new(HashMap::new()),
+            by_repo: HashMap::new(),
+            statuses: HashMap::new(),
             status_requested: HashSet::new(),
             push_requested: HashSet::new(),
-            push_statuses: Arc::new(HashMap::new()),
+            push_statuses: HashMap::new(),
             requested_head: HashMap::new(),
             refresh: RefreshGate::default(),
             _subscriptions: subscriptions,
@@ -155,6 +154,14 @@ impl CheckoutsStore {
         store
     }
 
+    /// Track a spawned task, pruning finished tasks first.
+    ///
+    /// Keeps the store's task list bounded by the number of in-flight tasks.
+    fn push_task(&mut self, task: Task<Result<(), Error>>) {
+        self.tasks.retain(|task| !task.is_ready());
+        self.tasks.push(task);
+    }
+
     /// Remember a successful local-checkout use.
     pub fn record(&mut self, path: PathBuf, addr: RepoAddr, cx: &mut Context<Self>) {
         if cfg!(target_arch = "wasm32") {
@@ -243,7 +250,7 @@ impl CheckoutsStore {
             this.update(cx, |this, cx| this.run_refresh(cx))
         });
 
-        self.tasks.push(task);
+        self.push_task(task);
     }
 
     /// One resolve and apply cycle, the debounced entry point.
@@ -345,7 +352,7 @@ impl CheckoutsStore {
             Ok::<_, Error>((associations, statuses, push_statuses))
         });
 
-        self.tasks.push(cx.spawn(async move |this, cx| {
+        self.push_task(cx.spawn(async move |this, cx| {
             let (associations, statuses, push_statuses) = match work.await {
                 Ok(results) => results,
                 Err(_) => {
@@ -357,9 +364,9 @@ impl CheckoutsStore {
             };
 
             let again = this.update(cx, |this, cx| {
-                this.by_repo = Arc::new(associations);
-                this.statuses = Arc::new(statuses);
-                this.push_statuses = Arc::new(push_statuses);
+                this.by_repo = associations;
+                this.statuses = statuses;
+                this.push_statuses = push_statuses;
                 cx.notify();
 
                 this.refresh.finish()
@@ -386,7 +393,7 @@ impl CheckoutsStore {
                         this.update(cx, |this, cx| this.run_refresh(cx))
                     });
 
-                    this.tasks.push(task);
+                    this.push_task(task);
                 }
             })?;