continuwuation/continuwuity
10
27
Fork 25
Code Issues 89 Pull requests 28 Projects Releases 18 Packages 3 Activity Actions

chore(rust): Update Rust Version + related changes #939

Merged
Jade merged 5 commits from Aviac/continuwuity:rust-v-1-89 into main 2025-08-21 23:57:08 +00:00
Conversation 3 Commits 5 Files changed 8 +28 -16
Aviac commented 2025-08-21 16:02:47 +00:00
Contributor
Copy link

Depends on #938

I think most of the commits should be rather self-descriptive. Feel free to just cherry-pick everything besides the fmt and clippy commits, since I don't really want to mess with other PRs, especially the v12 one.

Depends on #938 I think most of the commits should be rather self-descriptive. Feel free to just cherry-pick everything besides the `fmt` and `clippy` commits, since I don't really want to mess with other PRs, especially the v12 one.
This works without any further changes. Multiple people in the matrix
room (including myself) have reported that the built executable runs
fine with this. Nevertheless, there might be room for improvements (in
future commits)
chore(nix): exec 'use flake' with direnv on NixOS systems
Some checks failed
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m19s
Details
Checks / Prek / Pre-commit & Formatting (push) Failing after 6s
Details
Release Docker Image / define-variables (push) Successful in 3s
Details
Documentation / Build and Deploy Documentation (push) Successful in 33s
Details
Checks / Rust / Format (push) Successful in 49s
Details
Checks / Rust / Clippy (push) Successful in 3m23s
Details
Checks / Rust / Cargo Test (push) Successful in 6m11s
Details
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Has been cancelled
Details
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Has been cancelled
Details
Release Docker Image / merge (push) Has been cancelled
Details
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
256bed992e
 
- bump version in rust-toolchain.toml
- update sha in flake.nix
This just installs regular rustfmt, which is not needed in this project.
One could say "It doesn't hurt", but in the NixOS dev shell it actually
does since it will shadow nightly rustfmt and we don't have the
`cargo +nightly fmt` synatx on NixOS that is available on other Distros.

Also "It doesn't hurt" to delete it for non NixOS users.
I verified this by running `rustfmt --version` on my system. Note that I
don't have a system-wide install of rust and only rely on dev shells, so
this can't possibly come from somewhere else.

```
$ rustfmt --version
rustfmt 1.8.0-nightly (6677875279 2025-07-02)
```
This is required, since now we're installing `rustfmt` from the latest
state of the fenix repo. This wasn't recent enough for the latest rust
version. The input was locked at (2025-07-02). Now it's up to date.
- This mainly includes fixes for the new let-chain feature which was
  stabilized in 1.88, c.f.
  https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/#let-chains
chore(rust): run cargo fmt, required after last cargo clippy --fix
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 6s
Details
0a493715e4
 
Unfortunately the `cargo clippy --fix` broke the formatting here, so we
need to do another round of `cargo fmt` to get it back into shape.
Jade commented 2025-08-21 17:33:27 +00:00
Owner
Copy link

I think, to avoid diff turn when we've got so many pending PRs, we can just disable that lint for now. Otherwise we're just going to have to defer this for a while

I think, to avoid diff turn when we've got so many pending PRs, we can just disable that lint for now. Otherwise we're just going to have to defer this for a while
This reverts commit 0a493715e4.
Revert "chore(rust): just run cargo clippy --fix"
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 51s
Details
b6b90e9f0a
 
This reverts commit 7bbd4f1c1e.
Aviac commented 2025-08-21 19:58:11 +00:00
Author
Contributor
Copy link

I tidied this up by reverting the noisy commits. An issue was created to remind us (me) to do the work later. Should be much clearer now here :)

I tidied this up by reverting the noisy commits. An issue was created to remind us (me) to do the work later. Should be much clearer now here :)
Jade reviewed 2025-08-21 20:02:06 +00:00
rust-toolchain.toml Outdated
@ -18,3 +18,3 @@
# For CI and editors
"rustfmt",
"clippy",
# you have to install rustfmt nightly yourself (if you're not on NixOS)
Jade commented 2025-08-21 20:02:06 +00:00
Owner
Copy link

Duplicated section here?

Duplicated section here?
Jade marked this conversation as resolved
Jade force-pushed rust-v-1-89 from b6b90e9f0a to 8b35de6a43 2025-08-21 23:56:13 +00:00 Compare
Jade merged commit 8b35de6a43 into main 2025-08-21 23:57:08 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

Something isn't working as intended

  
Cherry-picking

Commits picked from other conduit projects

  
Database

This requires or includes changes to the database

  
Dependencies

Something dependency related

  
Dependencies/Renovate

Automatic dependency upgrades by Renovate

  
Difficulty
Easy
Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation

Improvements or additions to documentation

  
Enhancement

New feature or request

  
Good first issue

Good for newcomers

  
Help wanted

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Core

   
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Meta/Packaging

Packaging

  
Priority
Blocking
This issue is blocking the next release

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Security

This item is related to general security

  
Status
Confirmed

  
Status
Duplicate
This issue or pull request already exists

  
Status
Invalid
This issue doesn't seem right

  
Status
Needs Investigation
This issue needs further investigation

  
To-Merge

   
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Bug
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/Federation
Matrix/MSC
Matrix/Media
Meta
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
To-Merge
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 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#939
No description provided.
Delete branch "Aviac/continuwuity:rust-v-1-89"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?