Remove unused dependencies #1976

Merged
nex merged 8 commits from lake/continuwuity:feature/shear-unused-deps into main 2026-09-13 23:28:53 +00:00
Contributor

This pull request:

  • Removes unused dependencies using [cargo-shear] (and configures it to ignore the dependencies it flagged as false positives)
  • Adds a cargo shear check to CI to make sure that if any new unused dependencies will be automatically caught in the future

The final count reported by cargo-shear (after ignoring false positives) was 19 (edit: now likely fewer) removed dependencies for the workspace (this number is not unique, as cargo-shear counts the workspace and each crate separately).

Closes #1964.

Note: cargo-shear also reported some unused files, and dependencies that are only used in features, but not marked as optional, with a combined 19 warnings. I may try to address those in a future PR.

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
<!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> This pull request: - Removes unused dependencies using [`cargo-shear`] (and configures it to ignore the dependencies it flagged as false positives) - Adds a `cargo shear` check to CI to make sure that if any new unused dependencies will be automatically caught in the future The final count reported by `cargo-shear` (after ignoring false positives) was 19 *(edit: now likely fewer)* removed dependencies for the workspace (this number is not unique, as `cargo-shear` counts the workspace and each crate separately). Closes #1964. Note: `cargo-shear` also reported some unused files, and dependencies that are only used in features, but not marked as optional, with a combined 19 warnings. I may try to address those in a future PR. <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages
lake changed title from WIP: Remove unused dependencies to Remove unused dependencies 2026-07-12 21:11:26 +00:00
lake force-pushed feature/shear-unused-deps from 416d5ca4e6
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 7s
Checks / Prek / Check changed files (pull_request) Successful in 5s
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m9s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m24s
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
to 550a5c68f7
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Update flake hashes / update-flake-hashes (pull_request) Has been cancelled
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
2026-07-12 21:15:17 +00:00
Compare
lake force-pushed feature/shear-unused-deps from 550a5c68f7
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Update flake hashes / update-flake-hashes (pull_request) Has been cancelled
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
to c1ecc18572
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 12s
Checks / Prek / Check changed files (pull_request) Successful in 7s
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Update flake hashes / update-flake-hashes (pull_request) Has been cancelled
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
2026-07-12 21:16:19 +00:00
Compare
lake force-pushed feature/shear-unused-deps from c1ecc18572
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 12s
Checks / Prek / Check changed files (pull_request) Successful in 7s
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Update flake hashes / update-flake-hashes (pull_request) Has been cancelled
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
to eb885f9486
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Checks / Prek / Check changed files (pull_request) Successful in 8s
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 49s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m12s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m10s
2026-07-12 21:17:20 +00:00
Compare
lake changed title from Remove unused dependencies to WIP: Remove unused dependencies 2026-07-12 23:02:50 +00:00
lake force-pushed feature/shear-unused-deps from eb885f9486
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Checks / Prek / Check changed files (pull_request) Successful in 8s
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 49s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m12s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m10s
to b74b238e0a
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 26s
Checks / Prek / Check changed files (pull_request) Successful in 28s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m5s
Update flake hashes / update-flake-hashes (pull_request) Successful in 6m24s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m53s
2026-07-12 23:05:28 +00:00
Compare
lake changed title from WIP: Remove unused dependencies to Remove unused dependencies 2026-07-12 23:05:38 +00:00
nex approved these changes 2026-07-17 12:57:27 +00:00
nex requested review from Owners 2026-07-17 12:57:32 +00:00
Jade approved these changes 2026-07-17 18:38:02 +00:00
Dismissed
@ -47,7 +44,6 @@ tower-sessions-core = { version = "0.15.0", features = ["deletion-task"] }
serde_urlencoded.workspace = true
url.workspace = true
recaptcha-verify = { version = "0.2.0", default-features = false }
reqwest_recaptcha = { package = "reqwest", version = "0.12.28", default-features = false, features = ["rustls-tls-native-roots-no-provider"] } # As long as recaptcha-verify's reqwest is outdated
Owner

This is needed to explicitly enable the TLS backend feature, because recaptcha-verify doesn’t expose the option we want and uses an outdated version so it isn't enabled by another crate

This is needed to explicitly enable the TLS backend feature, because recaptcha-verify [doesn’t expose the option we want](https://crates.io/crates/recaptcha-verify/0.2.0/code/Cargo.toml#L52) and uses an outdated version so it isn't enabled by another crate
lake marked this conversation as resolved
Jade requested changes 2026-07-17 18:38:19 +00:00
Dismissed
Jade left a comment

missclick

missclick
lake force-pushed feature/shear-unused-deps from b74b238e0a
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 26s
Checks / Prek / Check changed files (pull_request) Successful in 28s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m5s
Update flake hashes / update-flake-hashes (pull_request) Successful in 6m24s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m53s
to 90ba751a2f
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m18s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m21s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m0s
2026-07-17 19:18:18 +00:00
Compare
Jade approved these changes 2026-07-17 19:54:33 +00:00
Jade left a comment

The irony is this doesn't actually cause any dependencies to be removed from the lockfile lol

The irony is this doesn't actually cause any dependencies to be removed from the lockfile lol
Author
Contributor

@Jade wrote in #1976 (comment):

The irony is this doesn't actually cause any dependencies to be removed from the lockfile lol

hm, that's not what I'm seeing. I did squash the lockfile, which caused a force push, so maybe new changes weren't visible at first

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1976#issuecomment-32488: > The irony is this doesn't actually cause any dependencies to be removed from the lockfile lol hm, that's not what I'm seeing. I did squash the lockfile, which caused a force push, so maybe new changes weren't visible at first
xtask/Cargo.toml Outdated
@ -11,7 +11,6 @@ version.workspace = true
[dependencies]
conduwuit-admin.workspace = true
conduwuit.workspace = true
Owner

This is also intentional, it is supposed to make sure that there is no thrashing due to changes in the enabled features in dependencies. I haven't checked that this works as intended though

This is also intentional, it is supposed to make sure that there is no thrashing due to changes in the enabled features in dependencies. I haven't checked that this works as intended though
Author
Contributor

do you want me to restore it?

do you want me to restore it?
Owner

There are deleted lines from the lockfile, however other crates depend on each of these crate versions, so no crate version is fully removed. going by this version

There are deleted lines from the lockfile, however other crates depend on each of these crate versions, so no crate version is fully removed. going by [this version](https://forgejo.ellis.link/continuwuation/continuwuity/src/commit/90ba751a2f936a29ef0e6fcfb0c583dccc25f262/Cargo.lock)
Owner

It's a good idea to do anyway though.

It's a good idea to do anyway though.
Author
Contributor

@Jade wrote in #1976 (comment):

There are deleted lines from the lockfile, however other crates depend on each of these crate versions, so no crate version is fully removed. going by this version

got it, fair enough. though it still removes those dependencies for those crates

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1976#issuecomment-32492: > There are deleted lines from the lockfile, however other crates depend on each of these crate versions, so no crate version is fully removed. going by [this version](https://forgejo.ellis.link/continuwuation/continuwuity/src/commit/90ba751a2f936a29ef0e6fcfb0c583dccc25f262/Cargo.lock) got it, fair enough. though it still removes those dependencies for those crates
silversys approved these changes 2026-07-17 21:22:39 +00:00
Dismissed
silversys left a comment

As long as this builds properly I have no major objections, only the few nitpicks in the other comments

As long as this builds properly I have no major objections, only the few nitpicks in the other comments
@ -0,0 +1 @@
Removed unused dependencies and added cargo-shear step to CI. Contributed by Lake (@ezeraOC)
Member

Unsure if feature is the correct name here, as it doesn't introduce anything new for end-users. I'd lean more towards misc

Unsure if `feature` is the correct name here, as it doesn't introduce anything new for end-users. I'd lean more towards `misc`
lake marked this conversation as resolved
@ -10,0 +6,4 @@
name = "conduwuit_web"
readme.workspace = true
repository.workspace = true
version.workspace = true
Member

As much as i love a well-formatted file, the formatting here seems out-of-scope for this PR? Can also make it more difficult to find the original creator of a line through git blame

As much as i love a well-formatted file, the formatting here seems out-of-scope for this PR? Can also make it more difficult to find the original creator of a line through `git blame`
Author
Contributor

it's now pulled out in a separate commit and ignored in .git-blame-ignore-revs. if you really don't want it here at all, I can drop the commit.

it's now pulled out in a separate commit and ignored in `.git-blame-ignore-revs`. if you really don't want it here at all, I can drop the commit.
Member

Works for me :)

Works for me :)
lake force-pushed feature/shear-unused-deps from 90ba751a2f
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m18s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m21s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m0s
to 862ce0f67d
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m18s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m32s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 1m35s
2026-07-17 21:53:10 +00:00
Compare
lake force-pushed feature/shear-unused-deps from 862ce0f67d
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m18s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m32s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 1m35s
to 7c17fe409c
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 1m2s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m11s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m15s
2026-07-17 21:56:29 +00:00
Compare
lake force-pushed feature/shear-unused-deps from 7c17fe409c
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 1m2s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m11s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m15s
to a0f8c818f3
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 5s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m14s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m13s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m3s
2026-07-17 22:02:30 +00:00
Compare
silversys approved these changes 2026-07-18 01:59:16 +00:00
Dismissed
silversys left a comment

lgtm

lgtm
Member

Looks like this has merge conflicts, could it be rebased?

Looks like this has merge conflicts, could it be rebased?
Author
Contributor

@Henry-Hiles wrote in #1976 (comment):

Looks like this has merge conflicts, could it be rebased?

done!

to avoid this falling behind again, it should be merged soon. any ongoing dependency/code churn in c10y essentially requires repeating the loop anew (resolve conflicts -> build -> run tests -> shear to catch anything that became unused since the last time -> catch shear's false positives -> build+test again), which gets fiddly.

@Henry-Hiles wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1976#issuecomment-35439: > Looks like this has merge conflicts, could it be rebased? done! to avoid this falling behind again, it should be merged soon. any ongoing dependency/code churn in c10y essentially requires repeating the loop anew (resolve conflicts -> build -> run tests -> shear to catch anything that became unused since the last time -> catch shear's false positives -> build+test again), which gets fiddly.
lake force-pushed feature/shear-unused-deps from e1738667a2
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Checks / Prek / Check changed files (pull_request) Successful in 9s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m38s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m51s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 2m30s
to 8ab842b198
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Checks / Prek / Check changed files (pull_request) Successful in 8s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m43s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m47s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m57s
2026-09-12 20:07:52 +00:00
Compare
silversys approved these changes 2026-09-12 23:33:56 +00:00
Henry-Hiles left a comment

Builds and runs, LGTM.

Builds and runs, LGTM.
Merge remote-tracking branch 'origin/main' into lake/feature/shear-unused-deps
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m31s
Checks / Prek / Check changed files (pull_request) Successful in 11s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m29s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m31s
Checks / Prek / Check changed files (push) Successful in 7s
Documentation / Build and Deploy Documentation (push) Successful in 1m10s
Checks / Prek / Pre-commit & Formatting (push) Successful in 1m21s
Checks / Prek / Clippy and Cargo Tests (push) Successful in 10m21s
Release Docker Image / Build linux-arm64 (release) (push) Successful in 19m49s
Release Docker Image / Build linux-amd64 (release) (push) Successful in 19m57s
Release Docker Image / Create Multi-arch Release Manifest (push) Successful in 21s
Release Docker Image / Build linux-amd64 (max-perf) (push) Successful in 35m2s
Release Docker Image / Build linux-arm64 (max-perf) (push) Successful in 38m38s
Release Docker Image / Release Binaries (push) Has been skipped
Release Docker Image / Create Max-Perf Manifest (push) Successful in 16s
Release Docker Image / Mirror Images (push) Failing after 2m26s
5f31f3fb10
Owner

This works and runs. I have webpush merged in my branch and it required this to pass clippy/build/etc

This works and runs. I have webpush merged in my branch and it required [this](https://forgejo.ellis.link/continuwuation/continuwuity/commit/a2e8d87fcf2e96a018714463702a84549524ed62) to pass clippy/build/etc
ginger approved these changes 2026-09-13 23:08:32 +00:00
nex merged commit 5f31f3fb10 into main 2026-09-13 23:28:53 +00:00
nex deleted branch feature/shear-unused-deps 2026-09-13 23:28:53 +00:00
nex referenced this pull request from a commit 2026-09-13 23:28:54 +00:00
Sign in to join this conversation.
No milestone
No assignees
7 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
continuwuation/continuwuity!1976
No description provided.