merge: #1265

1265: build(deps): update Rust dependencies (2022-W37) r=adamhjk a=fnichol Updates of note include: - An update to `tokio` which stabilizes [`JoinSet` and `AbortHandle`](tokio-rs/tokio#4920), meaning we can pull out the `tokio_unstable` config for the moment. - Major version bump to `serde-aux` with no impact on our codebase Signed-off-by: Fletcher Nichol <fletcher@systeminit.com> Co-authored-by: Fletcher Nichol <fletcher@systeminit.com>
systeminit · Sep 7, 2022 · 82c9057 · 82c9057
2 parents c1517cd + 528763c
commit 82c9057
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 39 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,10 +1,4 @@
 [target.x86_64-unknown-linux-gnu]
 rustflags = [
     "-C", "link-arg=-fuse-ld=lld",
-    "--cfg", "tokio_unstable",
-]
-
-[build]
-rustflags = [
-    "--cfg", "tokio_unstable",
 ]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/dal/Cargo.toml b/lib/dal/Cargo.toml
@@ -19,7 +19,7 @@ rand = "0.8.3"
 refinery = "0.8.4"
 serde = { version = "1.0.123", features = ["rc", "derive"] }
 serde_json = { version = "1.0.64", features = ["preserve_order"] }
-serde-aux = "3.0.1"
+serde-aux = "4.0.0"
 si-data = { path = "../../lib/si-data", features = ["nats", "pg"] }
 sodiumoxide = "0.2.6"
 strum = "0.24.0"