Skip to content

chore: update rust toolchain, migrate to 2024 edition #3535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jun 2, 2025
Merged

chore: update rust toolchain, migrate to 2024 edition #3535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
76d0a35
feat: derive the edition from the workspace Cargo.toml
tediou5 May 16, 2025
c7266f8
chore: update rust toolchain and edition
tediou5 May 16, 2025
01af654
fix: set_var is unsafe now
tediou5 May 16, 2025
ff6cdea
fix: remove the unnecessary binding modifier
tediou5 May 16, 2025
8e253d7
fix: rename feature duration_constructors => duration_constructors_lite
tediou5 May 16, 2025
cd16809
fix: capture more lifetime to adjusted the RPIT lifetime capture rules
tediou5 May 16, 2025
fdb55de
fix: extern blocks must be unsafe
tediou5 May 16, 2025
543b372
chore: run cargo -Zgitoxide -Zgit clippy --locked --all-targets --fea…
tediou5 May 16, 2025
500f33a
chore: run cargo -Zgitoxide -Zgit clippy --locked --all-targets --fea…
tediou5 Jun 1, 2025
71f66d3
chore(clippy): replace clone with std::slice::from_ref
tediou5 Jun 1, 2025
5788435
chore: cargo fmt --all
tediou5 May 16, 2025
ad37d83
feat: remove let_chains feature
tediou5 May 16, 2025
272b30b
Fix another slice::from_ref and some dead code
teor2345 Jun 2, 2025
dc3b82e
Remove extra newline in subspace-gateway/Cargo.toml
teor2345 Jun 2, 2025
62e7ae5
Use rustfmt 2024 edition
teor2345 Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/subspace-farmer/src/farm/plotted_pieces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ where
pub fn read_piece(
&self,
piece_index: PieceIndex,
) -> Option<impl Future<Output = Option<Piece>> + 'static> {
) -> Option<impl Future<Output = Option<Piece>> + use<FarmIndex>> {
Copy link
Member

@teor2345 teor2345 May 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can see, the use<FarmIndex> is only required for debugging, so it can be removed by doing:

let farm_index = usize::from(piece_details.farm_index);

near the start of the function.

This change doesn't need to be in this PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automatically performed (but the 'static needs to be manually removed):

cargo fix --broken-code

let piece_details = match self.pieces.get(&piece_index) {
Some(piece_details) => piece_details
.choose(&mut thread_rng())
Expand Down
3 changes: 2 additions & 1 deletion crates/subspace-farmer/src/single_disk_farm/farming.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ where
) -> Result<
Vec<(
SectorIndex,
impl ProvableSolutions<Item = Result<Solution<PublicKey>, ProvingError>> + 'a,
impl ProvableSolutions<Item = Result<Solution<PublicKey>, ProvingError>>
+ use<'a, PosTable, Plot>,
Comment on lines -137 to +138
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested by:

cargo fix --broken-code

)>,
AuditingError,
>
Expand Down