|
1 | 1 | use std::path::PathBuf; |
2 | 2 | use std::{sync::Arc, sync::Weak, time::SystemTime}; |
3 | 3 | use std::future::Future; |
4 | | -use tokio::fs::File; |
5 | 4 | use tokio::sync::{Mutex as AMutex, RwLock as ARwLock}; |
6 | 5 | use tokio::time::Duration; |
7 | | -use tokio_util::compat::{Compat, TokioAsyncWriteCompatExt}; |
8 | 6 | use tracing::{error, info, warn}; |
9 | 7 | use url::Url; |
10 | 8 | use walkdir::WalkDir; |
@@ -282,7 +280,7 @@ async fn docker_create_network_if_not_exists(gcx: Arc<ARwLock<GlobalContext>>, d |
282 | 280 | let (network_ls_output, _) = docker.command_execute(&network_ls_command, gcx.clone(), true, true).await?; |
283 | 281 | if !network_ls_output.contains(network_name) { |
284 | 282 | let network_create_command = format!("network create {quoted_network_name}"); |
285 | | - let (network_create_output, _) = docker.command_execute(&network_create_command, gcx.clone(), true, true).await?; |
| 283 | + let (_network_create_output, _) = docker.command_execute(&network_create_command, gcx.clone(), true, true).await?; |
286 | 284 | } |
287 | 285 | Ok(()) |
288 | 286 | } |
@@ -402,12 +400,12 @@ async fn docker_container_sync_workspace( |
402 | 400 | let temp_tar_file = tempfile::Builder::new().suffix(".tar").tempfile() |
403 | 401 | .map_err(|e| format!("Error creating temporary tar file: {}", e))?.into_temp_path(); |
404 | 402 | let tar_file_name = temp_tar_file.file_name().unwrap_or_default().to_string_lossy().to_string(); |
405 | | - let tar_async_file = File::create(&temp_tar_file).await |
| 403 | + let tar_async_file = tokio::fs::File::create(&temp_tar_file).await |
406 | 404 | .map_err(|e| format!("Error opening temporary tar file: {}", e))?; |
407 | 405 |
|
408 | | - let mut tar_builder = async_tar::Builder::new(tar_async_file.compat_write()); |
| 406 | + let mut tar_builder = tokio_tar::Builder::new(tar_async_file); |
409 | 407 | tar_builder.follow_symlinks(true); |
410 | | - tar_builder.mode(async_tar::HeaderMode::Complete); |
| 408 | + tar_builder.mode(tokio_tar::HeaderMode::Complete); |
411 | 409 |
|
412 | 410 | let mut indexing_everywhere = crate::files_blocklist::reload_global_indexing_only(gcx.clone()).await; |
413 | 411 | let (all_files, _vcs_folders) = crate::files_in_workspace::retrieve_files_in_workspace_folders( |
@@ -460,7 +458,7 @@ async fn docker_container_sync_workspace( |
460 | 458 | } |
461 | 459 |
|
462 | 460 | async fn append_folder_if_exists( |
463 | | - tar_builder: &mut async_tar::Builder<Compat<File>>, |
| 461 | + tar_builder: &mut tokio_tar::Builder<tokio::fs::File>, |
464 | 462 | workspace_folder: &PathBuf, |
465 | 463 | folder_name: &str |
466 | 464 | ) -> Result<(), String> { |
|
0 commit comments