Skip to content

Commit d8c634f

Browse files
committed
Merge branch 'main' into eliza/vpd
2 parents 0017c81 + 6c0aca2 commit d8c634f

41 files changed

Lines changed: 2856 additions & 562 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

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

Cargo.toml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,28 @@ resolver = "2"
1919

2020
[workspace.dependencies]
2121
tlvc = { git = "https://github.com/oxidecomputer/tlvc.git", branch = "main" }
22-
hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main"}
22+
turin-post-decoder = { git = "https://github.com/oxidecomputer/turin-post-decoder", branch = "master" }
23+
hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", rev = "2b1ef9b38d75563ea800baa3b17327eec17b1b7a" }
2324
slog-error-chain = { git = "https://github.com/oxidecomputer/slog-error-chain.git", branch = "main", features = ["derive"] }
2425

2526
anyhow = "1.0"
2627
async-trait = "0.1"
2728
backoff = { version = "0.4.0", features = ["tokio"] }
2829
base64 = "0.22.1"
29-
bitflags = "2.9.3"
30-
camino = "1.1.12"
30+
bitflags = "2.9.4"
31+
camino = "1.2.1"
3132
camino-tempfile = "1.4.1"
3233
clap = { version = "4.5", features = ["derive", "env"] }
34+
colored = "3"
3335
convert_case = "0.8"
36+
erebor = { git = "https://github.com/oxidecomputer/erebor", rev = "48512bf970474ff0fd0868c833fd504c8d169064" }
3437
expectorate = "=1.1.0" # 1.2 requires rust 1.75; bump eventually
3538
futures = "0.3.31"
3639
fxhash = "0.2.1"
3740
glob = "0.3.3"
3841
hex = "0.4.3"
3942
hubpack = "0.1.2"
40-
humantime = "2.2.0"
43+
humantime = "2.3.0"
4144
indicatif = "0.18"
4245
lru-cache = "0.1.2"
4346
lzss = "0.8"
@@ -49,31 +52,31 @@ parse_int = "0.6"
4952
rand = "0.9.2"
5053
serde = { version = "1.0", default-features = false, features = ["derive"] }
5154
serde-big-array = "0.5.1"
52-
serde_bytes = "0.11.17"
55+
serde_bytes = "0.11.19"
5356
serde_cbor = "0.11.2"
54-
serde_json = "1.0.143"
57+
serde_json = "1.0.145"
5558
serde_repr = { version = "0.1" }
5659
sha2 = "0.10"
5760
slog = { version = "2.7", features = ["max_level_trace", "release_max_level_trace"] }
5861
slog-async = "2.8"
5962
slog-term = "2.9"
6063
smoltcp = { version = "0.9", default-features = false, features = ["proto-ipv6"] }
61-
socket2 = "0.6.0"
64+
socket2 = "0.6.1"
6265
ssh-agent-client-rs = "0.9.1"
6366
ssh-key = { version = "0.6.7", features = ["p256"] }
6467
static_assertions = "1.1.0"
6568
strum = { version = "0.27.2", default-features = false }
6669
strum_macros = "0.27.2"
6770
string_cache = "0.8.9"
6871
termios = "0.3"
69-
thiserror = "2.0.16"
70-
tokio = { version = "1.29", features = ["full"] }
72+
thiserror = "2.0.17"
73+
tokio = { version = "1.48", features = ["full"] }
7174
tokio-stream = { version = "0.1", features = ["fs"] }
7275
tokio-util = { version = "0.7", features = ["compat"] }
7376
usdt = "0.5.0"
74-
uuid = { version = "1.16", default-features = false }
77+
uuid = { version = "1.18", default-features = false }
7578
version_check = "0.9.5"
76-
zerocopy = "0.8.26"
79+
zerocopy = "0.8.27"
7780
zip = { version = "0.6.6", default-features = false, features = ["deflate", "bzip2"] }
7881

7982
gateway-messages.path = "gateway-messages"

compose-wireshark-plugin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "compose-wireshark-plugin"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55
license = "MPL-2.0"
66

77
[dependencies]

faux-mgs/Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
[package]
22
name = "faux-mgs"
3-
version = "0.1.1"
4-
edition = "2021"
3+
version = "0.1.2"
4+
edition = "2024"
55
license = "MPL-2.0"
66

77
[dependencies]
88
anyhow.workspace = true
99
async-trait.workspace = true
1010
camino.workspace = true
1111
clap.workspace = true
12+
colored.workspace = true
13+
erebor.workspace = true
1214
futures.workspace = true
1315
glob.workspace = true
1416
hex.workspace = true
@@ -34,3 +36,4 @@ zerocopy.workspace = true
3436

3537
gateway-messages = { workspace = true, features = ["std"] }
3638
gateway-sp-comms.workspace = true
39+
turin-post-decoder.workspace = true

0 commit comments

Comments
 (0)