Skip to content

Commit

Permalink
merge main into branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunshowers
sunshowers committed Aug 3, 2024
2 parents 0b18b9f + 88d17f4 commit 18c9149
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-
gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "319e7b92db69792ab8efa4c68554ad0cf83adf93" }
gateway-test-utils = { path = "gateway-test-utils" }
gateway-types = { path = "gateway-types" }
gethostname = "0.4.3"
gethostname = "0.5.0"
glob = "0.3.1"
guppy = "0.17.7"
headers = "0.3.9"
Expand Down Expand Up @@ -548,7 +548,7 @@ tokio-stream = "0.1.15"
tokio-tungstenite = "0.20"
tokio-util = { version = "0.7.11", features = ["io", "io-util"] }
toml = "0.8.19"
toml_edit = "0.22.16"
toml_edit = "0.22.20"
tough = { version = "0.17.1", features = [ "http" ] }
trust-dns-client = "0.22"
trust-dns-proto = "0.22"
Expand Down
20 changes: 10 additions & 10 deletions workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,51 +231,51 @@ 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"] }
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"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[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"] }
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"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[target.x86_64-apple-darwin.dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[target.x86_64-apple-darwin.build-dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[target.aarch64-apple-darwin.dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[target.aarch64-apple-darwin.build-dependencies]
mio = { version = "0.8.11", features = ["net", "os-ext"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }

[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"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }

[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"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "termios"] }
rustix = { version = "0.38.34", features = ["fs", "system", "termios"] }
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }

Expand Down

0 comments on commit 18c9149

Please sign in to comment.