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

Fix warnings surfaced in Rust 1.71

Browse source
This commit is contained in:
Max Brunsfeld 2023-08-02 09:19:23 -07:00
parent 4c7d60ed13
commit a127b0d3e6
7 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/src/tests/randomized_integration_tests.rs
View file

@ -183,7 +183,7 @@ async fn apply_server_operation(
let username; let username;
{ {
let mut plan = plan.lock(); let mut plan = plan.lock();
let mut user = plan.user(user_id); let user = plan.user(user_id);
if user.online { if user.online {
return false; return false;
} }

4
crates/editor/src/display_map/inlay_map.rs
View file

@ -397,7 +397,7 @@ impl InlayMap {
buffer_snapshot: MultiBufferSnapshot, buffer_snapshot: MultiBufferSnapshot,
mut buffer_edits: Vec<text::Edit<usize>>, mut buffer_edits: Vec<text::Edit<usize>>,
) -> (InlaySnapshot, Vec<InlayEdit>) { ) -> (InlaySnapshot, Vec<InlayEdit>) {
let mut snapshot = &mut self.snapshot; let snapshot = &mut self.snapshot;
if buffer_edits.is_empty() { if buffer_edits.is_empty() {
if snapshot.buffer.trailing_excerpt_update_count() if snapshot.buffer.trailing_excerpt_update_count()
@ -572,7 +572,6 @@ impl InlayMap {
}) })
.collect(); .collect();
let buffer_snapshot = snapshot.buffer.clone(); let buffer_snapshot = snapshot.buffer.clone();
drop(snapshot);
let (snapshot, edits) = self.sync(buffer_snapshot, buffer_edits); let (snapshot, edits) = self.sync(buffer_snapshot, buffer_edits);
(snapshot, edits) (snapshot, edits)
} }
@ -635,7 +634,6 @@ impl InlayMap {
} }
log::info!("removing inlays: {:?}", to_remove); log::info!("removing inlays: {:?}", to_remove);
drop(snapshot);
let (snapshot, edits) = self.splice(to_remove, to_insert); let (snapshot, edits) = self.splice(to_remove, to_insert);
(snapshot, edits) (snapshot, edits)
} }

1
crates/editor/src/inlay_hint_cache.rs
View file

@ -571,7 +571,6 @@ fn new_update_task(
if let Some(buffer) = if let Some(buffer) =
refresh_multi_buffer.buffer(pending_refresh_query.buffer_id) refresh_multi_buffer.buffer(pending_refresh_query.buffer_id)
{ {
drop(refresh_multi_buffer);
editor.inlay_hint_cache.update_tasks.insert( editor.inlay_hint_cache.update_tasks.insert(
pending_refresh_query.excerpt_id, pending_refresh_query.excerpt_id,
UpdateTask { UpdateTask {

2
crates/project/src/worktree.rs
View file

@ -2369,7 +2369,7 @@ impl BackgroundScannerState {
} }
// Remove any git repositories whose .git entry no longer exists. // Remove any git repositories whose .git entry no longer exists.
let mut snapshot = &mut self.snapshot; let snapshot = &mut self.snapshot;
let mut repositories = mem::take(&mut snapshot.git_repositories); let mut repositories = mem::take(&mut snapshot.git_repositories);
let mut repository_entries = mem::take(&mut snapshot.repository_entries); let mut repository_entries = mem::take(&mut snapshot.repository_entries);
repositories.retain(|work_directory_id, _| { repositories.retain(|work_directory_id, _| {

2
crates/sum_tree/src/cursor.rs
View file

@ -202,7 +202,7 @@ where
self.position = D::default(); self.position = D::default();
} }
let mut entry = self.stack.last_mut().unwrap(); let entry = self.stack.last_mut().unwrap();
if !descending { if !descending {
if entry.index == 0 { if entry.index == 0 {
self.stack.pop(); self.stack.pop();

2
crates/vim/src/normal/search.rs
View file

@ -93,7 +93,7 @@ fn search_submit(workspace: &mut Workspace, _: &SearchSubmit, cx: &mut ViewConte
pane.update(cx, |pane, cx| { pane.update(cx, |pane, cx| {
if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() { if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
search_bar.update(cx, |search_bar, cx| { search_bar.update(cx, |search_bar, cx| {
let mut state = &mut vim.state.search; let state = &mut vim.state.search;
let mut count = state.count; let mut count = state.count;
// in the case that the query has changed, the search bar // in the case that the query has changed, the search bar

1
crates/zed/src/zed.rs
View file

@ -545,7 +545,6 @@ pub fn handle_keymap_file_changes(
reload_keymaps(cx, &keymap_content); reload_keymaps(cx, &keymap_content);
} }
}) })
.detach();
})); }));
} }
} }