WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit e0e1641

Browse files
committed
fix
1 parent 6488f50 commit e0e1641

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

.github/workflows/butterflynet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
env:
3232
# To minimize compile times: https://nnethercote.github.io/perf-book/build-configuration.html#minimizing-compile-times
3333
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=lld"
34-
run: make install-slim
34+
run: make install-minimum-dev
3535
- name: Run butterflynet checks
3636
run: ./scripts/tests/butterflynet_check.sh
3737
timeout-minutes: ${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}

.github/workflows/forest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
env:
9393
# To minimize compile times: https://nnethercote.github.io/perf-book/build-configuration.html#minimizing-compile-times
9494
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=lld"
95-
run: make install-slim
95+
run: make install-minimum-dev
9696
- uses: actions/upload-artifact@v6
9797
with:
9898
name: "forest-${{ runner.os }}"

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,11 @@ lto = "fat"
303303
# These should be refactored (probably removed) in #2984
304304
[features]
305305
default = ["jemalloc", "tokio-console", "tracing-loki", "tracing-chrome"]
306-
slim = ["rustalloc"]
307306
doctest-private = [] # see lib.rs::doctest_private
308307
benchmark-private = ["dep:criterion"] # see lib.rs::benchmark_private
309308
interop-tests-private = [] # see lib.rs::interop_tests_private
310309

311310
# Allocator. Use at most one of these.
312-
rustalloc = []
313311
jemalloc = ["dep:tikv-jemallocator"]
314312
system-alloc = [] # Use the platform allocator (for memory profiling).
315313

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
install:
22
cargo install --locked --path . --force
33

4-
install-slim:
5-
cargo install --no-default-features --features slim --locked --path . --force
6-
74
install-minimum:
85
cargo install --no-default-features --locked --path . --force
96

7+
install-minimum-dev:
8+
cargo install --debug --no-default-features --locked --path . --force
9+
1010
install-lto-fat:
1111
cargo install --locked --force --profile release-lto-fat --path .
1212

1313
# Installs Forest binaries with default rust global allocator
1414
install-with-rustalloc:
15-
cargo install --locked --path . --force --no-default-features --features rustalloc
15+
cargo install --locked --path . --force --no-default-features
1616

1717
install-lint-tools:
1818
cargo install --locked taplo-cli

interop-tests/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ anyhow = { workspace = true }
1515
cid = { workspace = true }
1616
flume = { workspace = true }
1717
forest = { package = "forest-filecoin", path = "../", default-features = false, features = [
18-
"rustalloc",
1918
"interop-tests-private",
2019
"no-f3-sidecar",
2120
] }

src/cli_shared/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ use crate::utils::io::read_toml;
1010
use std::path::PathBuf;
1111

1212
cfg_if::cfg_if! {
13-
if #[cfg(feature = "rustalloc")] {
14-
} else if #[cfg(feature = "jemalloc")] {
13+
if #[cfg(feature = "jemalloc")] {
1514
pub use tikv_jemallocator;
1615
}
1716
}

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
)]
2626

2727
cfg_if::cfg_if! {
28-
if #[cfg(feature = "rustalloc")] {
29-
} else if #[cfg(feature = "jemalloc")] {
28+
if #[cfg(feature = "jemalloc")] {
3029
use crate::cli_shared::tikv_jemallocator::Jemalloc;
3130
#[global_allocator]
3231
static GLOBAL: Jemalloc = Jemalloc;

0 commit comments

Comments
 (0)