1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-25 21:13:57 +00:00

Merge remote-tracking branch 'dani/main' into sso-support

This commit is contained in:
Timshel 2025-04-10 11:16:55 +02:00
commit 3696fbe601
8 changed files with 35 additions and 31 deletions

View file

@ -1,4 +1,5 @@
workspace = { members = ["macros"] }
[workspace]
members = ["macros"]
[package]
name = "vaultwarden"
@ -75,7 +76,7 @@ dashmap = "6.1.0"
# Async futures
futures = "0.3.31"
tokio = { version = "1.44.1", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal", "net"] }
tokio = { version = "1.44.2", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal", "net"] }
# A generic serialization/deserialization framework
serde = { version = "1.0.219", features = ["derive"] }
@ -170,11 +171,9 @@ semver = "1.0.26"
# Allow overriding the default memory allocator
# Mainly used for the musl builds, since the default musl malloc is very slow
# Currently pinned to v0.1.44/v0.1.40 because of compile issues with musl - https://github.com/microsoft/mimalloc/issues/1056
mimalloc = { version = "=0.1.44", features = ["secure"], default-features = false, optional = true }
libmimalloc-sys = { version = "=0.1.40", optional = true }
mimalloc = { version = "0.1.46", features = ["secure"], default-features = false, optional = true }
which = "7.0.2"
which = "7.0.3"
# Argon2 library with support for the PHC format
argon2 = "0.5.3"
@ -225,7 +224,7 @@ codegen-units = 16
# Linting config
# https://doc.rust-lang.org/rustc/lints/groups.html
[lints.rust]
[workspace.lints.rust]
# Forbid
unsafe_code = "forbid"
non_ascii_idents = "forbid"
@ -255,7 +254,7 @@ if_let_rescope = "allow"
tail_expr_drop_order = "allow"
# https://rust-lang.github.io/rust-clippy/stable/index.html
[lints.clippy]
[workspace.lints.clippy]
# Warn
dbg_macro = "warn"
todo = "warn"
@ -293,3 +292,6 @@ unused_async = "deny"
unused_self = "deny"
verbose_file_reads = "deny"
zero_sized_map_values = "deny"
[lints]
workspace = true