Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions crates/uhttp/src/file_server/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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(),
Expand All @@ -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<dyn AsyncFileSystem>,
Expand Down
4 changes: 2 additions & 2 deletions crates/uhttp/src/file_server/transpile/typescript/tsconfig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down