diff --git a/Cargo.lock b/Cargo.lock index 4eb80df..66d4de6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877bf67ac8e52449eb2f9e98a344ea163beb70dd1f9eebe3cc5357dcfeaee4df" +checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" dependencies = [ "find-msvc-tools", "jobserver", @@ -481,9 +481,9 @@ checksum = "fd8e701084c37e7ef62d3f9e453b618130cbc0ef3573847785952a3ac3f746bf" [[package]] name = "dyn_fs" -version = "0.0.15" +version = "0.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bcd48649f0cf1f80c4d8d8d0a9210a3e44f8ff8722214971e5fef46a3cb50d" +checksum = "11643e2733934189d122571ccce275a79f54d2754b877b60e79b8b2fcf46e663" dependencies = [ "include_dir", "tokio", diff --git a/Cargo.toml b/Cargo.toml index ba4062a..d73c2cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,5 +48,5 @@ include_dir = "0.7" flate2 = "1" brotli = "9" serde_urlencoded = "0.7" -dyn_fs = "0.0.15" +dyn_fs = "0.0.16" crossbeam = "0.8.5" diff --git a/crates/uhttp/src/file_server/builder.rs b/crates/uhttp/src/file_server/builder.rs index 45a8bf0..32c9c67 100644 --- a/crates/uhttp/src/file_server/builder.rs +++ b/crates/uhttp/src/file_server/builder.rs @@ -7,7 +7,7 @@ use super::FileServerCache; use super::FileServerOptions; use super::create; use super::file_system::AsyncFileSystem; -use super::file_system::TokioFileSystem; +use super::file_system::AsyncTokioFileSystem; use crate::HandleFunc; use crate::StatusCode; #[cfg(feature = "file_server_transpile")] @@ -59,7 +59,7 @@ pub struct FileServerBuilder { impl Default for FileServerBuilder { fn default() -> Self { Self { - file_system: TokioFileSystem::new(), + file_system: AsyncTokioFileSystem::new(), root_dir: PathBuf::from("."), compress: false, etag: ETagStrategy::default(), @@ -75,7 +75,7 @@ impl Default for FileServerBuilder { } impl FileServerBuilder { - /// The filesystem files are read from. Defaults to [`TokioFileSystem`]. + /// The filesystem files are read from. Defaults to [`AsyncTokioFileSystem`]. pub fn file_system( mut self, file_system: Arc, diff --git a/crates/uhttp/src/file_server/transpile/typescript/tsconfig.rs b/crates/uhttp/src/file_server/transpile/typescript/tsconfig.rs index 7cfc95f..39c8bf3 100644 --- a/crates/uhttp/src/file_server/transpile/typescript/tsconfig.rs +++ b/crates/uhttp/src/file_server/transpile/typescript/tsconfig.rs @@ -433,13 +433,13 @@ mod tests { use std::fs; use std::io::Write; - use dyn_fs::asynch::TokioFileSystem; + use dyn_fs::asynch::AsyncTokioFileSystem; use super::*; fn test_fs() -> (ConfigFs, tokio::runtime::Runtime) { let runtime = tokio::runtime::Runtime::new().unwrap(); - let fs = ConfigFs::new(TokioFileSystem::new(), runtime.handle().clone()); + let fs = ConfigFs::new(AsyncTokioFileSystem::new(), runtime.handle().clone()); (fs, runtime) }