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

Fix more warnings

Browse source
This commit is contained in:
Joseph T. Lyons 2023-12-25 07:02:19 -05:00
parent 8f3ea6ccb3
commit 12fe64b177
1 changed files with 43 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

91
crates/zed2/src/main.rs
View file

@ -250,7 +250,7 @@ fn main() {
cx: &mut AppContext, cx: &mut AppContext,
) { ) {
let task = workspace::open_paths(&paths, &app_state, None, cx); let task = workspace::open_paths(&paths, &app_state, None, cx);
cx.spawn(|cx| async move { cx.spawn(|_| async move {
if let Some((_window, results)) = task.await.log_err() { if let Some((_window, results)) = task.await.log_err() {
for result in results { for result in results {
if let Some(Err(e)) = result { if let Some(Err(e)) = result {
@ -311,53 +311,48 @@ fn main() {
} }
let app_state = app_state.clone(); let app_state = app_state.clone();
let closure_client = client.clone(); cx.spawn(move |cx| async move {
cx.spawn(move |mut cx| { while let Some(request) = open_rx.next().await {
let client = closure_client.clone(); match request {
async move { OpenRequest::Paths { paths } => {
while let Some(request) = open_rx.next().await { cx.update(|cx| open_paths_and_log_errs(&paths, &app_state, cx))
match request { .ok();
OpenRequest::Paths { paths } => { }
cx.update(|cx| open_paths_and_log_errs(&paths, &app_state, cx)) OpenRequest::CliConnection { connection } => {
.ok(); let app_state = app_state.clone();
} cx.spawn(move |cx| {
OpenRequest::CliConnection { connection } => { handle_cli_connection(connection, app_state.clone(), cx)
let app_state = app_state.clone(); })
cx.spawn(move |cx| { .detach();
handle_cli_connection(connection, app_state.clone(), cx) }
}) OpenRequest::JoinChannel { channel_id } => {
.detach(); let app_state = app_state.clone();
} cx.update(|mut cx| {
OpenRequest::JoinChannel { channel_id } => { cx.spawn(|cx| async move {
let app_state = app_state.clone(); cx.update(|cx| {
cx.update(|mut cx| { workspace::join_channel(channel_id, app_state, None, cx)
cx.spawn(|cx| async move { })?
cx.update(|cx| { .await?;
workspace::join_channel(channel_id, app_state, None, cx)
})?
.await?;
anyhow::Ok(())
})
.detach_and_log_err(&mut cx);
})
.log_err();
}
OpenRequest::OpenChannelNotes { channel_id } => {
let app_state = app_state.clone();
let open_notes_task = cx.spawn(|mut cx| async move {
let workspace_window =
workspace::get_any_active_workspace(app_state, cx.clone())
.await?;
let _ = workspace_window
.update(&mut cx, |_, cx| {
ChannelView::open(channel_id, cx.view().clone(), cx)
})?
.await?;
anyhow::Ok(()) anyhow::Ok(())
}); })
cx.update(|cx| open_notes_task.detach_and_log_err(cx)) .detach_and_log_err(&mut cx);
.log_err(); })
} .log_err();
}
OpenRequest::OpenChannelNotes { channel_id } => {
let app_state = app_state.clone();
let open_notes_task = cx.spawn(|mut cx| async move {
let workspace_window =
workspace::get_any_active_workspace(app_state, cx.clone()).await?;
let _ = workspace_window
.update(&mut cx, |_, cx| {
ChannelView::open(channel_id, cx.view().clone(), cx)
})?
.await?;
anyhow::Ok(())
});
cx.update(|cx| open_notes_task.detach_and_log_err(cx))
.log_err();
} }
} }
} }
@ -773,7 +768,7 @@ async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>)
fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) { fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
use std::time::Duration; use std::time::Duration;
cx.spawn(|mut cx| async move { cx.spawn(|cx| async move {
let mut events = fs let mut events = fs
.watch( .watch(
"assets/icons/file_icons/file_types.json".as_ref(), "assets/icons/file_icons/file_types.json".as_ref(),