Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(all): remove jemalloc #5833

Merged
merged 1 commit into from
Sep 14, 2023
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
23 changes: 0 additions & 23 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ chrono = { version = "0.4", default-features = false, features = ["clock", "std"
hex = { package = "const-hex", version = "1.6", features = ["hex"] }
itertools = "0.11"
solang-parser = "=0.3.2"
tikv-jemallocator = "0.5.4"

#[patch."https://github.com/gakonst/ethers-rs"]
#ethers = { path = "../ethers-rs/ethers" }
Expand Down
6 changes: 1 addition & 5 deletions crates/cast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,13 @@ tokio = { version = "1", features = ["macros", "signal"] }
tracing = "0.1"
yansi = "0.5"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = { workspace = true, optional = true }

[dev-dependencies]
foundry-test-utils.workspace = true
async-trait = "0.1"
criterion = "0.5"

[features]
default = ["rustls", "jemalloc"]
jemalloc = ["dep:tikv-jemallocator"]
default = ["rustls"]
rustls = ["foundry-cli/rustls"]
openssl = ["foundry-cli/openssl"]

Expand Down
4 changes: 0 additions & 4 deletions crates/cast/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ pub mod opts;

use opts::{Opts, Subcommands, ToBaseArgs};

#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;

#[tokio::main]
async fn main() -> Result<()> {
utils::load_dotenv();
Expand Down
6 changes: 1 addition & 5 deletions crates/chisel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,13 @@ dirs = "5"
time = { version = "0.3", features = ["formatting"] }
regex = "1"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = { workspace = true, optional = true }

[dev-dependencies]
criterion = { version = "0.5", features = ["async_tokio"] }
serial_test = "2"
once_cell = "1"

[features]
default = ["rustls", "jemalloc"]
jemalloc = ["dep:tikv-jemallocator"]
default = ["rustls"]
rustls = ["ethers/rustls", "reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"]
openssl = ["ethers/openssl", "reqwest/default-tls"]

Expand Down
4 changes: 0 additions & 4 deletions crates/chisel/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ use foundry_config::{
use rustyline::{config::Configurer, error::ReadlineError, Editor};
use yansi::Paint;

#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;

// Loads project's figment and merges the build cli arguments into it
foundry_config::merge_impl_figment_convert!(ChiselParser, opts, evm_opts);

Expand Down
6 changes: 1 addition & 5 deletions crates/forge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ thiserror = "1"
tokio = { version = "1", features = ["time"] }
watchexec = "2"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = { workspace = true, optional = true }

[dev-dependencies]
anvil.workspace = true
foundry-test-utils.workspace = true
Expand All @@ -78,8 +75,7 @@ serial_test = "2"
svm = { package = "svm-rs", version = "0.3", default-features = false, features = ["rustls"] }

[features]
default = ["rustls", "jemalloc"]
jemalloc = ["dep:tikv-jemallocator"]
default = ["rustls"]
rustls = ["foundry-cli/rustls", "reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"]
openssl = ["foundry-cli/openssl", "reqwest/default-tls"]

Expand Down
4 changes: 0 additions & 4 deletions crates/forge/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ mod opts;
use cmd::{cache::CacheSubcommands, generate::GenerateSubcommands, watch};
use opts::{Opts, Subcommands};

#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;

fn main() -> Result<()> {
utils::load_dotenv();
handler::install()?;
Expand Down