diff --git a/Cargo.lock b/Cargo.lock index b56a707afd0..812045bfa34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1555,9 +1555,9 @@ checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" dependencies = [ "futures-channel", "futures-core", @@ -1570,9 +1570,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" dependencies = [ "futures-core", "futures-sink", @@ -1580,15 +1580,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" dependencies = [ "futures-core", "futures-task", @@ -1597,15 +1597,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" dependencies = [ "proc-macro2", "quote", @@ -1614,21 +1614,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" dependencies = [ "futures-channel", "futures-core", diff --git a/common/Cargo.toml b/common/Cargo.toml index e863b728eb0..1ec7ddee1cf 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -10,7 +10,7 @@ api_identity = { path = "../api_identity" } backoff = { version = "0.4.0", features = [ "tokio" ] } chrono = { version = "0.4", features = [ "serde" ] } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } -futures = "0.3.21" +futures = "0.3.23" http = "0.2.7" hyper = "0.14" ipnetwork = "0.20" diff --git a/gateway-cli/Cargo.toml b/gateway-cli/Cargo.toml index d980055a652..fc7a3f99a58 100644 --- a/gateway-cli/Cargo.toml +++ b/gateway-cli/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" [dependencies] anyhow = "1.0" clap = "3.2.17" -futures = "0.3.21" +futures = "0.3.23" libc = "0.2" slog-async = "2.6" slog-term = "2.9" diff --git a/gateway-client/Cargo.toml b/gateway-client/Cargo.toml index 960a8e66793..4d90c3709e5 100644 --- a/gateway-client/Cargo.toml +++ b/gateway-client/Cargo.toml @@ -8,7 +8,7 @@ license = "MPL-2.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } serde_json = "1.0" -futures = "0.3.21" +futures = "0.3.23" [dependencies.chrono] version = "0.4" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index f610a254535..99f97a3ba12 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" [dependencies] clap = { version = "3.2", features = ["derive"] } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } -futures = "0.3.21" +futures = "0.3.23" hex = "0.4" http = "0.2.7" hyper = "0.14.20" diff --git a/internal-dns-client/Cargo.toml b/internal-dns-client/Cargo.toml index fe92884f00a..ff9bbcc6476 100644 --- a/internal-dns-client/Cargo.toml +++ b/internal-dns-client/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MPL-2.0" [dependencies] -futures = "0.3.21" +futures = "0.3.23" omicron-common = { path = "../common" } progenitor = { git = "https://github.com/oxidecomputer/progenitor" } reqwest = { version = "0.11", features = ["json", "rustls-tls", "stream"] } diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 8755adf9aeb..83a40f48e36 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -19,7 +19,7 @@ crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev diesel = { version = "2.0.0-rc.1", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", rev = "b9262a79db59f0727ca28ca9baed6fc6e3cc31e7" } fatfs = "0.3.5" -futures = "0.3.21" +futures = "0.3.23" headers = "0.3.7" hex = "0.4.3" http = "0.2.7" diff --git a/nexus/src/authz/policy_test/mod.rs b/nexus/src/authz/policy_test/mod.rs index 1602a4dc713..85544860134 100644 --- a/nexus/src/authz/policy_test/mod.rs +++ b/nexus/src/authz/policy_test/mod.rs @@ -184,7 +184,7 @@ async fn authorize_everything( let mut futures = futures::stream::FuturesOrdered::new(); for resource in test_resources.resources() { let log = log.new(o!("resource" => format!("{:?}", resource))); - futures.push(authorize_one_resource( + futures.push_back(authorize_one_resource( log, user_contexts.to_owned(), Arc::clone(&resource), diff --git a/oxide-client/Cargo.toml b/oxide-client/Cargo.toml index ecb4c59af76..f5b3f5bba6f 100644 --- a/oxide-client/Cargo.toml +++ b/oxide-client/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MPL-2.0" [dependencies] -futures = "0.3.21" +futures = "0.3.23" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } regress = "0.4.1" serde_json = "1.0.82" diff --git a/oximeter/instruments/Cargo.toml b/oximeter/instruments/Cargo.toml index 2c2cd8471e9..eb202b11aba 100644 --- a/oximeter/instruments/Cargo.toml +++ b/oximeter/instruments/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" [dependencies] chrono = { version = "0.4", features = [ "serde" ] } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } -futures = "0.3.21" +futures = "0.3.23" oximeter = { path = "../oximeter" } http = { version = "0.2.7", optional = true } uuid = { version = "1.1.0", features = [ "v4", "serde" ] } diff --git a/package/Cargo.toml b/package/Cargo.toml index 4e71071da00..020c9258c0f 100644 --- a/package/Cargo.toml +++ b/package/Cargo.toml @@ -8,7 +8,7 @@ license = "MPL-2.0" [dependencies] anyhow = "1.0" clap = { version = "3.2", features = ["derive"] } -futures = "0.3.21" +futures = "0.3.23" hex = "0.4.3" indicatif = { version = "0.16.2", features = ["rayon"] } omicron-common = { path = "../common" } diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index ecc0ab8c2c5..6a8516988da 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -18,7 +18,7 @@ crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "1d67a53042f19ff7ca30dd20a04da94b7715ed7c" } ddm-admin-client = { path = "../ddm-admin-client" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } -futures = "0.3.21" +futures = "0.3.23" internal-dns-client = { path = "../internal-dns-client" } ipnetwork = "0.20" libc = "0.2.132" diff --git a/sled-agent/src/storage_manager.rs b/sled-agent/src/storage_manager.rs index 3ec65c6427d..e9cfa6f6b4b 100644 --- a/sled-agent/src/storage_manager.rs +++ b/sled-agent/src/storage_manager.rs @@ -656,7 +656,7 @@ impl StorageWorker { "failed to notify nexus, will retry in {:?}", delay; ); }; - nexus_notifications.push( + nexus_notifications.push_back( backoff::retry_notify( backoff::internal_service_policy(), notify_nexus, @@ -702,7 +702,7 @@ impl StorageWorker { "failed to notify nexus about datasets, will retry in {:?}", delay; ); }; - nexus_notifications.push( + nexus_notifications.push_back( backoff::retry_notify( backoff::internal_service_policy(), notify_nexus, diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index b222ec3ae5c..bb0b9d4ee0c 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" [dependencies] anyhow = "1.0" clap = { version = "3.2", features = ["derive"] } -futures = "0.3.21" +futures = "0.3.23" libc = "0.2.132" omicron-common = { path = "../common" } postgres-protocol = "0.6.4"