From 07cf0e0cf38aba22ee73e03cc46cba2711725a03 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Thu, 7 Sep 2023 09:29:52 -0600 Subject: [PATCH] Fix a merge error A conflict between PRs #474 and #473 resulted in a broken build. --- crates/unftp-sbe-fs/tests/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/unftp-sbe-fs/tests/main.rs b/crates/unftp-sbe-fs/tests/main.rs index f751fb99..50c2ae98 100644 --- a/crates/unftp-sbe-fs/tests/main.rs +++ b/crates/unftp-sbe-fs/tests/main.rs @@ -375,7 +375,7 @@ async fn rmd() { let root = std::env::temp_dir(); tokio::spawn(libunftp::Server::with_fs(root.clone()).listen(addr)); - tokio::time::sleep(Duration::new(1, 0)).await; + tokio::time::sleep(std::time::Duration::new(1, 0)).await; let mut ftp_stream = FtpStream::connect(addr).await.unwrap(); let dir_in_root = tempfile::tempdir_in(root).unwrap(); let file_name = dir_in_root.path().file_name().unwrap().to_str().unwrap();