user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix building rustdoc and clippy with jemalloc feature

Browse source
This commit is contained in:
Mads Marquart 2025-10-25 23:40:39 +02:00
parent dd2159e75d
commit 65f0b7aad4
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock
View file

@ -600,6 +600,7 @@ dependencies = [
"serde_json", "serde_json",
"tempfile", "tempfile",
"termize", "termize",
"tikv-jemalloc-sys",
"toml 0.9.7", "toml 0.9.7",
"ui_test", "ui_test",
"walkdir", "walkdir",
@ -4806,6 +4807,7 @@ dependencies = [
"stringdex", "stringdex",
"tempfile", "tempfile",
"threadpool", "threadpool",
"tikv-jemalloc-sys",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"tracing-tree", "tracing-tree",

3
src/librustdoc/Cargo.toml
View file

@ -24,6 +24,7 @@ smallvec = "1.8.1"
stringdex = "=0.0.2" stringdex = "=0.0.2"
tempfile = "3" tempfile = "3"
threadpool = "1.8.1" threadpool = "1.8.1"
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
tracing = "0.1" tracing = "0.1"
tracing-tree = "0.3.0" tracing-tree = "0.3.0"
unicode-segmentation = "1.9" unicode-segmentation = "1.9"
@ -42,7 +43,7 @@ minifier = { version = "0.3.2", default-features = false }
expect-test = "1.4.0" expect-test = "1.4.0"
[features] [features]
jemalloc = [] jemalloc = ["dep:tikv-jemalloc-sys"]
[package.metadata.rust-analyzer] [package.metadata.rust-analyzer]
rustc_private = true rustc_private = true

3
src/tools/clippy/Cargo.toml
View file

@ -31,6 +31,7 @@ tempfile = { version = "3.20", optional = true }
termize = "0.2" termize = "0.2"
color-print = "0.3.4" color-print = "0.3.4"
anstream = "0.6.18" anstream = "0.6.18"
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
[dev-dependencies] [dev-dependencies]
cargo_metadata = "0.18.1" cargo_metadata = "0.18.1"
@ -56,7 +57,7 @@ rustc_tools_util = { path = "rustc_tools_util", version = "0.4.2" }
[features] [features]
integration = ["dep:tempfile"] integration = ["dep:tempfile"]
internal = ["dep:clippy_lints_internal", "dep:tempfile"] internal = ["dep:clippy_lints_internal", "dep:tempfile"]
jemalloc = [] jemalloc = ["dep:tikv-jemalloc-sys"]
[package.metadata.rust-analyzer] [package.metadata.rust-analyzer]
# This package uses #[feature(rustc_private)] # This package uses #[feature(rustc_private)]