Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/collab/src/api/extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ async fn fetch_extensions_from_blob_store(
.list_objects()
.bucket(blob_store_bucket)
.prefix("extensions/")
.set_marker(next_marker.clone())
.set_marker(next_marker.take())
.send()
.await?;
let objects = list.contents.unwrap_or_default();
Expand Down
11 changes: 8 additions & 3 deletions crates/context_server/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,14 @@ impl NotificationSubscriptionSet {
return;
};

for handler_id in handler_ids {
if let Some(handler) = self.handlers.get_mut(*handler_id) {
handler(payload.clone(), cx.clone());
if let Some((last_handler_id, handler_ids)) = handler_ids.split_last() {
for handler_id in handler_ids {
if let Some(handler) = self.handlers.get_mut(*handler_id) {
handler(payload.clone(), cx.clone());
}
}
if let Some(handler) = self.handlers.get_mut(*last_handler_id) {
handler(payload, cx.clone());
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions crates/editor/src/rewrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,14 @@ impl Editor {
Point::new(current_range_start, 0)
..Point::new(prev_row, buffer.line_len(MultiBufferRow(prev_row))),
current_range_indent,
current_range_comment_delimiters.clone(),
current_range_rewrap_prefix.clone(),
std::mem::replace(
&mut current_range_comment_delimiters,
row_comment_delimiters,
),
std::mem::replace(&mut current_range_rewrap_prefix, row_rewrap_prefix),
));
current_range_start = row;
current_range_indent = row_indent;
current_range_comment_delimiters = row_comment_delimiters;
current_range_rewrap_prefix = row_rewrap_prefix;
}
prev_row = row;
}
Expand Down
6 changes: 3 additions & 3 deletions crates/project/src/manifest_tree/path_trie.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ impl<Label: Ord + Clone> RootPathTrie<Label> {
for key in path.0.iter() {
path_so_far = path_so_far.join(RelPath::from_unix_str(key.as_ref()).unwrap());
current = match current.children.entry(key.clone()) {
Entry::Vacant(vacant_entry) => {
vacant_entry.insert(RootPathTrie::new_with_key(path_so_far.clone().into()))
}
Entry::Vacant(vacant_entry) => vacant_entry.insert(RootPathTrie::new_with_key(
Arc::from(path_so_far.as_rel_path()),
)),
Entry::Occupied(occupied_entry) => occupied_entry.into_mut(),
};
}
Expand Down
Loading