Skip to content

Commit

Permalink
Merge branch 'main' into null-etw-userdata
Browse files Browse the repository at this point in the history
  • Loading branch information
vvuk authored May 7, 2024
2 parents 6954b01 + 47152e8 commit 9b47f2a
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
42 changes: 16 additions & 26 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion fxprof-processed-profile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gecko_profile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion samply-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
10 changes: 5 additions & 5 deletions samply/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -33,13 +33,13 @@ 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"
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"
Expand All @@ -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]
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion wholesym/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 9b47f2a

Please sign in to comment.