[PM-29535] Update cargo-sort (#602)

## 🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-29535

## 📔 Objective

Upgrades the version of cargo-sort used to the latest. This changes
slightly the ordering and formatting of some of the Cargo.toml files,
but they should be functionally identical. The change should help reduce
the ammount of accidental changes made by devs when they install a too
new version of cargo-sort.

If you're running cargo-sort locally, make sure it's updated and that
you're running the correct command (Now it needs a `--grouped`
parameter). I'll post this on the SDK channel as well once the change is
merged:
```sh
# To install it
cargo install cargo-sort --version 2.0.2 --locked

# To sort and format the cargo manifests
cargo sort --workspace --grouped

# To check if the files are sorted correctly, without making any changes
cargo sort --workspace --grouped --check
```

## 🚨 Breaking Changes

<!-- Does this PR introduce any breaking changes? If so, please describe
the impact and migration path for clients.

If you're unsure, the automated TypeScript compatibility check will run
when you open/update this PR and provide feedback.

For breaking changes:
1. Describe what changed in the client interface
2. Explain why the change was necessary
3. Provide migration steps for client developers
4. Link to any paired client PRs if needed

Otherwise, you can remove this section. -->

## ⏰ Reminders before review

- Contributor guidelines followed
- All formatters and local linters executed and passed
- Written new unit and / or integration tests where applicable
- Protected functional changes with optionality (feature flags)
- Used internationalization (i18n) for all UI strings
- CI builds passed
- Communicated to DevOps any deployment requirements
- Updated any necessary documentation (Confluence, contributing docs) or
informed the documentation
  team

## 🦮 Reviewer guidelines

<!-- Suggested interactions but feel free to use (or not) as you desire!
-->

- 👍 (`:+1:`) or similar for great changes
- 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info
- ❓ (`:question:`) for questions
- 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry
that's not quite a confirmed
  issue and could potentially benefit from discussion
- 🎨 (`:art:`) for suggestions / improvements
- ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or
concerns needing attention
- 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or
indications of technical debt
- ⛏ (`:pick:`) for minor or nitpick changes

Author: dani-garcia

.github/workflows/lint.yml

@@ -87,10 +87,10 @@ jobs:
           RUSTFLAGS: "-D warnings"
 
       - name: Install cargo-sort
-        run: cargo install cargo-sort --locked --git https://github.com/DevinR528/cargo-sort.git --rev f5047967021cbb1f822faddc355b3b07674305a1
+        run: cargo install cargo-sort --version 2.0.2 --locked
 
       - name: Cargo sort
-        run: cargo sort --workspace --check
+        run: cargo sort --workspace --grouped --check
 
       - name: Install cargo-udeps
         run: cargo install cargo-udeps --version 0.1.57 --locked

Cargo.toml

@@ -70,11 +70,11 @@ reqwest = { version = ">=0.12.5, <0.13", features = [
 rsa = ">=0.9.2, <0.10"
 schemars = { version = ">=1.0.0, <2.0", features = ["uuid1", "chrono04"] }
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
+serde-wasm-bindgen = ">=0.6.0, <0.7"
 serde_bytes = { version = ">=0.11.17, <0.12.0" }
 serde_json = ">=1.0.96, <2.0"
 serde_qs = ">=0.12.0, <0.16"
 serde_repr = ">=0.1.12, <0.2"
-serde-wasm-bindgen = ">=0.6.0, <0.7"
 sha1 = ">=0.10.5, <0.11"
 subtle = ">=2.5.0, <3.0"
 syn = ">=2.0.87, <3"
@@ -99,15 +99,6 @@ wasm-bindgen-test = "0.3.55"
 wiremock = ">=0.6.0, <0.7"
 zxcvbn = ">=3.0.1, <4.0"
 
-[patch.crates-io]
-
-uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-uniffi_core = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-uniffi_internal_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
-
 [workspace.lints.clippy]
 disallowed-macros = "deny"
 unused_async = "deny"
@@ -123,17 +114,26 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 [workspace.metadata.dylint]
 libraries = [{ path = "support/lints" }]
 
-# Compile all dependencies with some optimizations when building this crate on debug
-# This slows down clean builds by about 50%, but the resulting binaries can be orders of magnitude faster
-# As clean builds won't occur very often, this won't slow down the development process
-[profile.dev.package."*"]
-opt-level = 2
+[patch.crates-io]
+
+uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
+uniffi_core = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
+uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
+uniffi_internal_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
+uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
+uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "6d46b3f756dde3213357c477d86771a0fc5da7b4" }
 
 # Turn on a small amount of optimisation in development mode. This might interfere when trying to use a debugger
 # if the compiler decides to optimize some code away, if that's the case, it can be set to 0 or commented out
 [profile.dev]
 opt-level = 1
 
+# Compile all dependencies with some optimizations when building this crate on debug
+# This slows down clean builds by about 50%, but the resulting binaries can be orders of magnitude faster
+# As clean builds won't occur very often, this won't slow down the development process
+[profile.dev.package."*"]
+opt-level = 2
+
 # Turn on LTO on release mode
 [profile.release]
 codegen-units = 1

README.md

@@ -142,7 +142,7 @@ cargo +nightly fmt --check
 cargo +nightly udeps --workspace --all-features
 cargo clippy --all-features --all-targets
 cargo dylint --all -- --all-features --all-targets
-cargo sort --workspace --check
+cargo sort --workspace --grouped --check
 npm run lint
 ```
 

bitwarden_license/bitwarden-commercial-vault/Cargo.toml

@@ -19,7 +19,7 @@ uniffi = ["dep:uniffi"] # Uniffi bindings
 wasm = [
     "dep:tsify",
     "dep:wasm-bindgen",
-    "dep:wasm-bindgen-futures"
+    "dep:wasm-bindgen-futures",
 ] # WASM support
 
 [dependencies]

crates/bitwarden-auth/Cargo.toml

@@ -19,7 +19,7 @@ wasm = [
     "bitwarden-core/wasm",
     "dep:tsify",
     "dep:wasm-bindgen",
-    "dep:wasm-bindgen-futures"
+    "dep:wasm-bindgen-futures",
 ] # WASM support
 
 # Note: dependencies must be alphabetized to pass the cargo sort check in the CI pipeline.

crates/bitwarden-collections/Cargo.toml

@@ -14,7 +14,7 @@ keywords.workspace = true
 uniffi = [
     "bitwarden-core/uniffi",
     "bitwarden-crypto/uniffi",
-    "dep:uniffi"
+    "dep:uniffi",
 ] # Uniffi bindings
 wasm = ["bitwarden-core/wasm", "dep:tsify", "dep:wasm-bindgen"] # WASM support
 

crates/bitwarden-core/Cargo.toml

@@ -17,15 +17,15 @@ keywords.workspace = true
 [features]
 internal = ["dep:zxcvbn"]
 no-memory-hardening = [
-    "bitwarden-crypto/no-memory-hardening"
+    "bitwarden-crypto/no-memory-hardening",
 ] # Disable memory hardening features
 secrets = [] # Secrets manager API
 uniffi = [
     "internal",
     "bitwarden-crypto/uniffi",
     "bitwarden-encoding/uniffi",
     "dep:bitwarden-uniffi-error",
-    "dep:uniffi"
+    "dep:uniffi",
 ] # Uniffi bindings
 wasm = [
     "bitwarden-crypto/wasm",
@@ -34,7 +34,7 @@ wasm = [
     "bitwarden-state/wasm",
     "dep:wasm-bindgen",
     "dep:wasm-bindgen-futures",
-    "dep:tsify"
+    "dep:tsify",
 ] # WASM support
 
 [dependencies]

crates/bitwarden-crypto/Cargo.toml

@@ -21,7 +21,7 @@ uniffi = [
     "argon2/parallel",
     "bitwarden-encoding/uniffi",
     "dep:bitwarden-uniffi-error",
-    "dep:uniffi"
+    "dep:uniffi",
 ] # Uniffi bindings
 wasm = ["dep:tsify", "dep:wasm-bindgen"] # WASM support
 

crates/bitwarden-error-macro/Cargo.toml

@@ -14,6 +14,9 @@ repository.workspace = true
 license-file.workspace = true
 keywords.workspace = true
 
+[lib]
+proc-macro = true
+
 [features]
 wasm = []
 
@@ -23,16 +26,13 @@ proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
 
-[lints]
-workspace = true
-
-[lib]
-proc-macro = true
-
 [dev-dependencies]
 bitwarden-error = { workspace = true, features = ["wasm"] }
 js-sys.workspace = true
 serde.workspace = true
 thiserror.workspace = true
 tsify.workspace = true
 wasm-bindgen.workspace = true
+
+[lints]
+workspace = true

crates/bitwarden-error/Cargo.toml

@@ -19,7 +19,7 @@ wasm = [
     "bitwarden-error-macro/wasm",
     "dep:js-sys",
     "dep:tsify",
-    "dep:wasm-bindgen"
+    "dep:wasm-bindgen",
 ]
 
 [dependencies]
@@ -28,10 +28,10 @@ js-sys = { workspace = true, optional = true }
 tsify = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 
-[lints]
-workspace = true
-
 [dev-dependencies]
 serde.workspace = true
 trybuild = "1.0.101"
 wasm-bindgen-test = { workspace = true }
+
+[lints]
+workspace = true