Skip to content

Commit

Permalink
Update Rust Dependencies 2024-05-29 (#226) (#229)
Browse files Browse the repository at this point in the history
* Moved deprecated .cargo/config to config.toml

* Ignore clippy warning

* Updated body_reader and channel dependencies

* Updated config-wasm and hdr-histogram dependencies

* Updated additional dependencies

- Held back hyper, http, and yansi due to major changes

* Updated Yansi to latest version

- Converted Paint::disable to Yansi::disable
- Removed Windows specific code. Yansi now will try to enable on Windows and automatically disables if it can't activate.

* Added build test-server to the PR script and workflow

* Fix dependency loop with ahash on itself

- tkaitchuck/aHash#95 (comment)
- rustwasm/wasm-bindgen#3031 (comment)

* Updated yaml-rust to use yaml-rust2 due to deprecation

- chyh1990/yaml-rust#197
- chyh1990/yaml-rust#160 (comment)

* Updated cargo deny to remove deprecated entries

- EmbarkStudios/cargo-deny#611
- https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html#the-clarify-field-optional

* Updated cargo lock file

* Updated code for deprecations

- Added tests for create_date_diff, then updated deprecated calls and confirmed tests still passed

* Added clippy ignore large results and errors

* Fixed tests to validate to UTC

- Since the PR flow runs on UTC, updated the local PR script to also run UTC
- Updated the create_date_diff test to validate UTC and print a warning to run UTC if it fails
  • Loading branch information
tkmcmaster authored Jun 3, 2024
1 parent e464536 commit 4e96359
Show file tree
Hide file tree
Showing 18 changed files with 563 additions and 1,979 deletions.
736 changes: 396 additions & 340 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ thiserror.workspace = true
tokio.workspace = true
tokio-stream = { version = "0.1", features = ["sync", "time"] }
url.workspace = true
yansi = "0.5"
yansi = "1"
zip_all.workspace = true
# https://github.com/softprops/json-env-logger/issues/6
log = { workspace = true, features = ["kv_unstable_std"] }
env_logger = "0.10"
env_logger = "0.11"
json_env_logger = { version = "0.1", features = ["iso-timestamps"] }
# https://github.com/sfackler/rust-openssl/issues/1021#issuecomment-605602642
openssl = { version = "0.10", features = ["vendored"] }
Expand Down Expand Up @@ -100,14 +100,14 @@ version = "0.6.0"
license = "Apache 2.0"

[workspace.dependencies]
base64 = "0.21"
base64 = "0.22"
config = { path = "./lib/config" }
ether = { path = "./lib/either" }
futures = "0.3"
futures-timer = "3"
http = "0.2"
hyper = "0.14"
itertools = "0.11"
itertools = "0.13"
js-sys = "0.3.64"
log = "0.4"
once_cell = "1.17.1"
Expand Down
File renamed without changes.
11 changes: 5 additions & 6 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
[graph]
targets = [
{ triple = "x86_64-unknown-linux-musl" },
{ triple = "aarch64-unknown-linux-musl" },
{ triple = "armv7-unknown-linux-musleabihf" },
{ triple = "x86_64-pc-windows-msvc" },
{ triple = "x86_64-apple-darwin" },
{ triple = "aarch64-apple-darwin" },
{ triple = "wasm32-unknown-unknown" },
]

[advisories]
db-path = "~/.cargo/advisory-db"
db-urls = ["https://github.com/rustsec/advisory-db"]
vulnerability = "deny"
unmaintained = "warn"
version = 2
yanked = "warn"
notice = "warn"
ignore = [
# "RUSTSEC-2020-0071",
]

[licenses]
private = { ignore = true }
unlicensed = "deny"
version = 2
allow = [
"Apache-2.0",
"BSD-3-Clause",
Expand All @@ -28,8 +29,6 @@ allow = [
"Unicode-DFS-2016",
"Zlib",
]
copyleft = "deny"
default = "deny"
confidence-threshold = 1.0

[bans]
Expand Down
4 changes: 2 additions & 2 deletions lib/body_reader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ doctest = false

[dependencies]
bytes = "1"
brotli-decompressor = "2"
brotli-decompressor = "4"
libflate = "2"

[dev-dependencies]
brotli = "3"
brotli = "6"
2 changes: 1 addition & 1 deletion lib/channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ doctest = false
ahash = "0.8"
concurrent-queue = "2"
dashmap = "5"
event-listener = "2"
event-listener = "5"
futures.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
Expand Down
9 changes: 7 additions & 2 deletions lib/config-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ crate-type = ["cdylib"]
config = { workspace = true, features = ["legacy"] }
js-sys.workspace = true
serde.workspace = true
serde-wasm-bindgen = "0.5"
wasm-bindgen = { workspace = true, features = ["serde-serialize"] }
serde-wasm-bindgen = "0.6"
# https://github.com/tkaitchuck/aHash/issues/95#issuecomment-1937448134
# https://github.com/rustwasm/wasm-bindgen/pull/3031#issuecomment-1442610289
wasm-bindgen = { workspace = true }
# Not a direct dependency but get random as of 0.2.2 throws an error on "unsupported targets"
# https://docs.rs/getrandom/0.2.2/getrandom/#unsupported-targets
# The fix is to add it as a supported target and specify the target. As of 0.2.2 both browser and nodejs use "js"
getrandom.workspace = true
log.workspace = true
wasm-logger.workspace = true
Loading

0 comments on commit 4e96359

Please sign in to comment.