From 25b8877b8aced760be6f8a3971cd8170eebce5be Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Mon, 6 May 2024 16:23:01 -0400 Subject: [PATCH 1/8] Stop running rustup update in CI because it's broken on Windows as of today. The error message says: error: could not remove 'setup' file: 'C:\Users\runneradmin\.cargo\bin/rustup-init.exe': Access is denied. (os error 5) --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6d8aa9e3..901474e8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -47,7 +47,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }} + run: rustup target add ${{ matrix.target }} - if: ${{ matrix.is_musl }} name: Install musl-tools run: sudo apt-get install -y musl-tools From c55f83eb7aa3f9d1b3b593823a437d98c806606e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 20:37:11 +0000 Subject: [PATCH 2/8] Bump num-traits from 0.2.18 to 0.2.19 Bumps [num-traits](https://github.com/rust-num/num-traits) from 0.2.18 to 0.2.19. - [Changelog](https://github.com/rust-num/num-traits/blob/master/RELEASES.md) - [Commits](https://github.com/rust-num/num-traits/compare/num-traits-0.2.18...num-traits-0.2.19) --- updated-dependencies: - dependency-name: num-traits dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45e355a0..b41a8598 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1316,9 +1316,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] From 4926889875312ef90e160b14539cb1a86f311091 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Mon, 6 May 2024 17:00:48 -0400 Subject: [PATCH 3/8] Remove rustup update from aarch64 Windows CI too. (#185) --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 901474e8..f7c6b2a7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -103,7 +103,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }} + run: rustup target add ${{ matrix.target }} - name: Check run: cargo check --workspace --verbose --target=${{ matrix.target }} - name: Clippy From 34fdbd6a34a116d2dcb8a1ca00c0bcd26a4c4830 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:22:37 +0000 Subject: [PATCH 4/8] Bump serde from 1.0.199 to 1.0.200 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.199 to 1.0.200. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.199...v1.0.200) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- fxprof-processed-profile/Cargo.toml | 2 +- gecko_profile/Cargo.toml | 2 +- samply-api/Cargo.toml | 2 +- samply/Cargo.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b41a8598..229258c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1977,18 +1977,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", diff --git a/fxprof-processed-profile/Cargo.toml b/fxprof-processed-profile/Cargo.toml index 4f6d0684..a9dd4782 100644 --- a/fxprof-processed-profile/Cargo.toml +++ b/fxprof-processed-profile/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" [dependencies] bitflags = "2.5" serde_json = "1.0" -serde = "1.0.199" +serde = "1.0.200" serde_derive = "1.0.188" debugid = "0.8.0" fxhash = "0.2.1" diff --git a/gecko_profile/Cargo.toml b/gecko_profile/Cargo.toml index 5fae36fb..54db3689 100644 --- a/gecko_profile/Cargo.toml +++ b/gecko_profile/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" [dependencies] serde_json = "1.0" -serde = "1.0.199" +serde = "1.0.200" serde_derive = "1.0.188" debugid = "0.8.0" diff --git a/samply-api/Cargo.toml b/samply-api/Cargo.toml index cf7e89e3..1720ee96 100644 --- a/samply-api/Cargo.toml +++ b/samply-api/Cargo.toml @@ -16,7 +16,7 @@ send_futures = ["samply-symbols/send_futures"] [dependencies] samply-symbols = { version = "0.22.0", path = "../samply-symbols" } thiserror = "1.0.59" -serde = "1.0.199" +serde = "1.0.200" serde_derive = "1.0.188" serde_json = "1.0.116" yaxpeax-arch = { version = "0.2.7", default-features = false } diff --git a/samply/Cargo.toml b/samply/Cargo.toml index 915988a4..6e78ed4e 100644 --- a/samply/Cargo.toml +++ b/samply/Cargo.toml @@ -39,7 +39,7 @@ opener = { version = "0.7.0", default-features = false } rand = "0.8.4" nix-base32 = "0.1.1" serde_derive = "1.0.137" -serde = "1.0.199" +serde = "1.0.200" wholesym = { version = "0.5.0", path = "../wholesym", features = ["api"]} dirs = "5.0.0" once_cell = "1.17" From 8801795cbac9028fa816afc074ba827d17b908c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:30:27 +0000 Subject: [PATCH 5/8] Bump zerocopy from 0.7.32 to 0.7.33 Bumps [zerocopy](https://github.com/google/zerocopy) from 0.7.32 to 0.7.33. - [Release notes](https://github.com/google/zerocopy/releases) - [Changelog](https://github.com/google/zerocopy/blob/main/CHANGELOG.md) - [Commits](https://github.com/google/zerocopy/compare/v0.7.32...v0.7.33) --- updated-dependencies: - dependency-name: zerocopy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 229258c8..0ba7d96c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2940,9 +2940,9 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" dependencies = [ "byteorder", "zerocopy-derive", @@ -2950,9 +2950,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" dependencies = [ "proc-macro2", "quote", From 065f08b403a68c4a70c1d58a133a3f7b67f3a212 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:30:49 +0000 Subject: [PATCH 6/8] Bump tokio-util from 0.7.10 to 0.7.11 Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.10 to 0.7.11. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.10...tokio-util-0.7.11) --- updated-dependencies: - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 5 ++--- samply/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ba7d96c..3d72e13e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2298,16 +2298,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] diff --git a/samply/Cargo.toml b/samply/Cargo.toml index 6e78ed4e..bc8dd5d5 100644 --- a/samply/Cargo.toml +++ b/samply/Cargo.toml @@ -18,7 +18,7 @@ framehop = "0.11.1" linux-perf-data = "0.10.1" tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "macros"] } -tokio-util = "0.7.10" +tokio-util = "0.7.11" hyper = { version = "1", features = ["full"] } hyper-util = { version = "0.1.3", features = ["server", "http1", "tokio"] } http-body-util = "0.1" From dcdebb01740fe3593d30a48cf29960be64353718 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:31:29 +0000 Subject: [PATCH 7/8] Bump libc from 0.2.153 to 0.2.154 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.153 to 0.2.154. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.153...0.2.154) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- samply/Cargo.toml | 4 ++-- wholesym/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d72e13e..0a952725 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1074,9 +1074,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libredox" diff --git a/samply/Cargo.toml b/samply/Cargo.toml index bc8dd5d5..e0c894c0 100644 --- a/samply/Cargo.toml +++ b/samply/Cargo.toml @@ -33,7 +33,7 @@ thiserror = "1.0.59" tempfile = "3.10.1" uuid = { version = "1.8.0", features = ["v4"] } percent-encoding = "2.1.0" -libc = "0.2.71" +libc = "0.2.154" flate2 = "1.0" opener = { version = "0.7.0", default-features = false } rand = "0.8.4" @@ -51,7 +51,7 @@ env_logger = "0.11.3" [target.'cfg(any(target_os = "android", target_os = "macos", target_os = "linux"))'.dependencies] -libc = "0.2.71" +libc = "0.2.154" crossbeam-channel = "0.5.12" [target.'cfg(target_os = "macos")'.dependencies] diff --git a/wholesym/Cargo.toml b/wholesym/Cargo.toml index f5788d45..33c7aa16 100644 --- a/wholesym/Cargo.toml +++ b/wholesym/Cargo.toml @@ -24,7 +24,7 @@ samply-symbols = { version = "0.22.0", path = "../samply-symbols", features = [" symsrv = "0.5.1" yoke = "0.7" yoke-derive = "0.7" -libc = "0.2.71" +libc = "0.2.154" uuid = "1" reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls", From 47152e8d54c7a818733ee3910bbda750bca34267 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:30:42 +0000 Subject: [PATCH 8/8] Bump memoffset from 0.6.5 to 0.9.1 Bumps [memoffset](https://github.com/Gilnaa/memoffset) from 0.6.5 to 0.9.1. - [Changelog](https://github.com/Gilnaa/memoffset/blob/master/CHANGELOG.md) - [Commits](https://github.com/Gilnaa/memoffset/compare/v0.6.5...v0.9.1) --- updated-dependencies: - dependency-name: memoffset dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 13 ++----------- samply/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a952725..f61c14a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -593,7 +593,7 @@ version = "0.1.0" dependencies = [ "bitflags 2.5.0", "fxhash", - "memoffset 0.9.1", + "memoffset", "num-derive", "num-traits", "once_cell", @@ -1200,15 +1200,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -1863,7 +1854,7 @@ dependencies = [ "mach", "memchr", "memmap2", - "memoffset 0.6.5", + "memoffset", "mio", "nix", "nix-base32", diff --git a/samply/Cargo.toml b/samply/Cargo.toml index e0c894c0..4fc1f57d 100644 --- a/samply/Cargo.toml +++ b/samply/Cargo.toml @@ -73,7 +73,7 @@ nix = { version = "0.28", features = ["fs", "process"] } rangemap = "1.3.0" bitflags = "2.4.2" -memoffset = "0.6" +memoffset = "0.9" num-traits = "0.2" num-derive = "0.4" runas = "1.2.0"