Skip to content

Commit

Permalink
[meta] update tokio to 1.39.3 (again) (#6452)
Browse files Browse the repository at this point in the history 
Tokio 1.39/mio 1.0 switches out the illumos impl to being eventfd based. For release 10 we decided that that was too risky, so we switched back to Tokio 1.38.

Now that the r10 branch has been cut, we can go back and update Tokio to 1.39.3. We'd like to land this early in the cycle to get as much soak time as possible.

See:

* #6356
* #6249
* oxidecomputer/helios#169
* oxidecomputer/helios#171
* #6391
  • Loading branch information
@sunshowers
sunshowers authored Aug 27, 2024
1 parent a0cdce7 commit 7a6f45c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 23 deletions.
18 changes: 8 additions & 10 deletions Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ textwrap = "0.16.1"
test-strategy = "0.3.1"
thiserror = "1.0"
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
tokio = "1.38.1"
tokio = "1.39.3"
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
tokio-stream = "0.1.15"
tokio-tungstenite = "0.20"
Expand Down
22 changes: 10 additions & 12 deletions workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,12 @@ sha2 = { version = "0.10.8", features = ["oid"] }
similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
spin = { version = "0.9.8" }
string_cache = { version = "0.8.7" }
subtle = { version = "2.5.0" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
tokio = { version = "1.38.1", features = ["full", "test-util"] }
tokio = { version = "1.39.3", features = ["full", "test-util"] }
tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
tokio-stream = { version = "0.1.15", features = ["net"] }
tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
Expand Down Expand Up @@ -211,15 +210,14 @@ sha2 = { version = "0.10.8", features = ["oid"] }
similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
spin = { version = "0.9.8" }
string_cache = { version = "0.8.7" }
subtle = { version = "2.5.0" }
syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
tokio = { version = "1.38.1", features = ["full", "test-util"] }
tokio = { version = "1.39.3", features = ["full", "test-util"] }
tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
tokio-stream = { version = "0.1.15", features = ["net"] }
tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
Expand All @@ -239,7 +237,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
[target.x86_64-unknown-linux-gnu.dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -248,43 +246,43 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
[target.x86_64-unknown-linux-gnu.build-dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-apple-darwin.dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-apple-darwin.build-dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.aarch64-apple-darwin.dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.aarch64-apple-darwin.build-dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-unknown-illumos.dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -293,7 +291,7 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu

[target.x86_64-unknown-illumos.build-dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand Down

0 comments on commit 7a6f45c

Please sign in to comment.