diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 70e5fac..69d21c8 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -21,11 +21,11 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ "sticky-cookie", ] } -anyhow = "1.0.73" +anyhow = "1.0.75" rustc-hash = "1.1.0" serde = { version = "1.0.183", default-features = false, features = ["derive"] } derive_builder = "0.12.0" -tokio = { version = "1.31.0", default-features = false, features = [ +tokio = { version = "1.32.0", default-features = false, features = [ "net", "rt-multi-thread", "time", @@ -34,9 +34,10 @@ tokio = { version = "1.31.0", default-features = false, features = [ ] } async-trait = "0.1.73" rustls-pemfile = "1.0.3" +mimalloc = { version = "*", default-features = false } # config -clap = { version = "4.3.21", features = ["std", "cargo", "wrap_help"] } +clap = { version = "4.3.22", features = ["std", "cargo", "wrap_help"] } toml = { version = "0.7.6", default-features = false, features = ["parse"] } hot_reload = "0.1.4" @@ -45,8 +46,4 @@ tracing = { version = "0.1.37" } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -[target.'cfg(not(target_env = "msvc"))'.dependencies] -tikv-jemallocator = "0.5.4" - - [dev-dependencies] diff --git a/rpxy-bin/src/main.rs b/rpxy-bin/src/main.rs index 474eff1..f04a6f1 100644 --- a/rpxy-bin/src/main.rs +++ b/rpxy-bin/src/main.rs @@ -1,9 +1,5 @@ -#[cfg(not(target_env = "msvc"))] -use tikv_jemallocator::Jemalloc; - -#[cfg(not(target_env = "msvc"))] #[global_allocator] -static GLOBAL: Jemalloc = Jemalloc; +static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; mod cert_file_reader; mod config; diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 7d48b44..59b76f6 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -23,7 +23,7 @@ rustc-hash = "1.1.0" bytes = "1.4.0" derive_builder = "0.12.0" futures = { version = "0.3.28", features = ["alloc", "async-await"] } -tokio = { version = "1.31.0", default-features = false, features = [ +tokio = { version = "1.32.0", default-features = false, features = [ "net", "rt-multi-thread", "time", @@ -35,8 +35,8 @@ async-trait = "0.1.73" hot_reload = "0.1.4" # reloading certs # Error handling -anyhow = "1.0.73" -thiserror = "1.0.45" +anyhow = "1.0.75" +thiserror = "1.0.47" # http and tls hyper = { version = "0.14.27", default-features = false, features = [