Skip to content

Commit

Permalink
merge: #1265
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
2 people authored and zacharyhamm committed Sep 7, 2022
2 parents c1517cd + 528763c commit 9e09fd9
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 161 deletions.
6 changes: 0 additions & 6 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -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",
]
64 changes: 32 additions & 32 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion lib/dal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 9e09fd9

Please sign in to comment.