Skip to content

Migrate to the 2024 edition#5560

Merged
youknowone merged 2 commits into
RustPython:mainfrom
arihant2math:2024-migrate
Feb 27, 2025
Merged

Migrate to the 2024 edition#5560
youknowone merged 2 commits into
RustPython:mainfrom
arihant2math:2024-migrate

Conversation

@arihant2math

Copy link
Copy Markdown
Contributor

No description provided.

@arihant2math arihant2math changed the title migrate to the 2024 edition Migrate to the 2024 edition Feb 25, 2025
@arihant2math

Copy link
Copy Markdown
Contributor Author

Everything was reformatted due to the 2024 upgrade.

@coolreader18

Copy link
Copy Markdown
Member

I might look to hold onto this until after #5561 merges, since they've been working on their patchset for a while and it seems like it'd be a pain to have to resolve formatting conflicts.

@coolreader18

coolreader18 commented Feb 26, 2025

Copy link
Copy Markdown
Member

It's annoying there's no way to switch to edition2024 while keeping the style edition on 2021, at least temporarily :/

@coolreader18

Copy link
Copy Markdown
Member

Good catch on the stuff in sre_engine, though, I'd merge a PR with those changes + adding [lints] workspace = true in that Cargo.toml.

@youknowone

Copy link
Copy Markdown
Member

I might look to hold onto this until after #5561 merges, since they've been working on their patchset for a while and it seems like it'd be a pain to have to resolve formatting conflicts.

That patch only has 2 changed files. Merging must not be painful.

@youknowone youknowone left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me. But if @coolreader18 worries, we can merge first commit without edition=2024 first, and do formatting later.

@coolreader18

Copy link
Copy Markdown
Member

Yeah, you're right, it doesn't actually make any conflicts at all. Fix the conflict and this is good to go 👍

@arihant2math

Copy link
Copy Markdown
Contributor Author

It's conflicting at the moment rather ironically.

@arihant2math

Copy link
Copy Markdown
Contributor Author

Setting the edition to 2021 doesn't change anything. I'll just resolve this conflict

Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants