Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Fix compile errors by commenting stuff out

Browse source
This commit is contained in:
Nathan Sobo 2022-05-07 13:59:21 -06:00
parent 4f06dca78b
commit 93dae88cac
3 changed files with 60 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/collab/src/rpc/store.rs
View file

@ -246,13 +246,13 @@ impl Store {
}
pub fn project_metadata_for_user(&self, user_id: UserId) -> Vec<proto::ProjectMetadata> {
let project_ids = self
.connections_by_user_id
.get(&user_id)
.unwrap_or_else(|| &HashSet::default())
.iter()
.filter_map(|connection_id| self.connections.get(connection_id))
.flat_map(|connection| connection.projects.iter().copied());
let connection_ids = self.connections_by_user_id.get(&user_id);
let project_ids = connection_ids.iter().flat_map(|connection_ids| {
connection_ids
.iter()
.filter_map(|connection_id| self.connections.get(connection_id))
.flat_map(|connection| connection.projects.iter().copied())
});
let mut metadata = Vec::new();
for project_id in project_ids {
@ -263,7 +263,7 @@ impl Store {
worktree_root_names: project
.worktrees
.values()
.map(|worktree| worktree.root_name)
.map(|worktree| worktree.root_name.clone())
.collect(),
guests: project
.share