Skip to content

Commit 68693df

Browse files
nmattiaIDX GitHub Automation
andauthored
feat: deduplicate pprof-related dependencies (#11100)
This tweaks the crate versions used by pprof to align with what we already have in the repo. --------- Co-authored-by: IDX GitHub Automation <infra+github-automation@dfinity.org>
1 parent abfe200 commit 68693df

6 files changed

Lines changed: 22 additions & 76 deletions

File tree

Cargo.Bazel.json.lock

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "cd7b92369e4d498b6965c0e0bc5ccb8b54b93625fcf019e728c5f73909055231",
2+
"checksum": "30910d61ae2a85ff78c48df31f8f827448980a04806846d2a25450109bdf5259",
33
"crates": {
44
"actix-codec 0.5.1": {
55
"name": "actix-codec",
@@ -47011,6 +47011,8 @@
4701147011
"default",
4701247012
"ioctl",
4701347013
"memoffset",
47014+
"process",
47015+
"signal",
4701447016
"socket"
4701547017
],
4701647018
"selects": {}
@@ -54580,7 +54582,7 @@
5458054582
"Git": {
5458154583
"remote": "https://github.com/dfinity/pprof-rs",
5458254584
"commitish": {
54583-
"Rev": "7f5228262196e3eb9c8d1ddbaca984787dea331a"
54585+
"Rev": "9159b45ecc3540d7fc44c6a6e70a173676cfa771"
5458454586
}
5458554587
}
5458654588
},
@@ -54663,7 +54665,7 @@
5466354665
"target": "log"
5466454666
},
5466554667
{
54666-
"id": "nix 0.30.1",
54668+
"id": "nix 0.27.1",
5466754669
"target": "nix"
5466854670
},
5466954671
{
@@ -54683,7 +54685,7 @@
5468354685
"target": "smallvec"
5468454686
},
5468554687
{
54686-
"id": "spin 0.10.1",
54688+
"id": "spin 0.9.8",
5468754689
"target": "spin"
5468854690
},
5468954691
{
@@ -70199,52 +70201,6 @@
7019970201
}
7020070202
],
7020170203
"library_target_name": "spin",
70202-
"common_attrs": {
70203-
"compile_data_glob": [
70204-
"**"
70205-
],
70206-
"crate_features": {
70207-
"common": [
70208-
"mutex",
70209-
"once",
70210-
"spin_mutex"
70211-
],
70212-
"selects": {}
70213-
},
70214-
"edition": "2015",
70215-
"version": "0.9.8"
70216-
},
70217-
"license": "MIT",
70218-
"license_ids": [
70219-
"MIT"
70220-
],
70221-
"license_file": "LICENSE"
70222-
},
70223-
"spin 0.10.1": {
70224-
"name": "spin",
70225-
"version": "0.10.1",
70226-
"package_url": "https://github.com/mvdnes/spin-rs.git",
70227-
"repository": {
70228-
"Http": {
70229-
"url": "https://static.crates.io/crates/spin/0.10.1/download",
70230-
"sha256": "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
70231-
}
70232-
},
70233-
"targets": [
70234-
{
70235-
"Library": {
70236-
"crate_name": "spin",
70237-
"crate_root": "src/lib.rs",
70238-
"srcs": {
70239-
"allow_empty": true,
70240-
"include": [
70241-
"**/*.rs"
70242-
]
70243-
}
70244-
}
70245-
}
70246-
],
70247-
"library_target_name": "spin",
7024870204
"common_attrs": {
7024970205
"compile_data_glob": [
7025070206
"**"
@@ -70255,6 +70211,7 @@
7025570211
"default",
7025670212
"lazy",
7025770213
"lock_api",
70214+
"lock_api_crate",
7025870215
"mutex",
7025970216
"once",
7026070217
"rwlock",
@@ -70273,7 +70230,7 @@
7027370230
"selects": {}
7027470231
},
7027570232
"edition": "2015",
70276-
"version": "0.10.1"
70233+
"version": "0.9.8"
7027770234
},
7027870235
"license": "MIT",
7027970236
"license_ids": [

Cargo.Bazel.toml.lock

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7109,7 +7109,7 @@ version = "1.5.0"
71097109
source = "registry+https://github.com/rust-lang/crates.io-index"
71107110
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
71117111
dependencies = [
7112-
"spin 0.9.8",
7112+
"spin",
71137113
]
71147114

71157115
[[package]]
@@ -7917,7 +7917,7 @@ dependencies = [
79177917
"log",
79187918
"memchr",
79197919
"mime",
7920-
"spin 0.9.8",
7920+
"spin",
79217921
"version_check",
79227922
]
79237923

@@ -9204,7 +9204,7 @@ dependencies = [
92049204
[[package]]
92059205
name = "pprof"
92069206
version = "0.15.0"
9207-
source = "git+https://github.com/dfinity/pprof-rs?rev=7f5228262196e3eb9c8d1ddbaca984787dea331a#7f5228262196e3eb9c8d1ddbaca984787dea331a"
9207+
source = "git+https://github.com/dfinity/pprof-rs?rev=9159b45ecc3540d7fc44c6a6e70a173676cfa771#9159b45ecc3540d7fc44c6a6e70a173676cfa771"
92089208
dependencies = [
92099209
"aligned-vec",
92109210
"backtrace",
@@ -9214,13 +9214,13 @@ dependencies = [
92149214
"inferno",
92159215
"libc",
92169216
"log",
9217-
"nix 0.30.1",
9217+
"nix 0.27.1",
92189218
"once_cell",
92199219
"prost",
92209220
"prost-build",
92219221
"sha2 0.10.9",
92229222
"smallvec",
9223-
"spin 0.10.1",
9223+
"spin",
92249224
"symbolic-demangle",
92259225
"tempfile",
92269226
"thiserror 2.0.18",
@@ -11705,12 +11705,6 @@ name = "spin"
1170511705
version = "0.9.8"
1170611706
source = "registry+https://github.com/rust-lang/crates.io-index"
1170711707
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
11708-
11709-
[[package]]
11710-
name = "spin"
11711-
version = "0.10.1"
11712-
source = "registry+https://github.com/rust-lang/crates.io-index"
11713-
checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
1171411708
dependencies = [
1171511709
"lock_api",
1171611710
]

Cargo.lock

Lines changed: 5 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ pem = { version = "^3", default-features = false, features = ["std"] }
813813
pin-project-lite = "^0.2"
814814
ping = "0.5.0"
815815
pkcs8 = "0.10.2"
816-
pprof = { git = "https://github.com/dfinity/pprof-rs", rev = "7f5228262196e3eb9c8d1ddbaca984787dea331a", default-features = false, features = [
816+
pprof = { git = "https://github.com/dfinity/pprof-rs", rev = "9159b45ecc3540d7fc44c6a6e70a173676cfa771", default-features = false, features = [
817817
"criterion",
818818
"flamegraph",
819819
"prost-codec",
@@ -977,6 +977,7 @@ uuid = { version = "=1.12.1", features = ["v4", "serde"] }
977977
virt = "0.4"
978978
walkdir = "2.3.3"
979979
walrus = "0.26.4"
980+
warp = { version = "0.3.7", features = ["tls"] }
980981
wasm-encoder = { version = "0.252.0", features = ["wasmparser"] }
981982
wasm-smith = { version = "0.252.0", default-features = false, features = ["wasmparser"] }
982983
wasmparser = "0.252.0"

bazel/rust.MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ crate.spec(
12071207
# https://github.com/tikv/pprof-rs
12081208
git = "https://github.com/dfinity/pprof-rs",
12091209
package = "pprof",
1210-
rev = "7f5228262196e3eb9c8d1ddbaca984787dea331a",
1210+
rev = "9159b45ecc3540d7fc44c6a6e70a173676cfa771",
12111211
)
12121212
crate.spec(
12131213
package = "predicates",

rs/https_outcalls/adapter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ socks5-impl = { version = "0.6", features = ["tokio"] }
4545
tempfile = { workspace = true }
4646
tokio-rustls = { workspace = true }
4747
uuid = { workspace = true }
48-
warp = { version = "0.3.7", features = ["tls"] }
48+
warp = { workspace = true }
4949

5050
[features]
5151
http = []

0 commit comments

Comments
 (0)