Skip to content
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

Jump to bottom

Use stable rust for cargo-fmt #618

Open
1 task done
MarcoIeni opened this issue Apr 21, 2024 · 1 comment · May be fixed by #834
Open
1 task done

Use stable rust for cargo-fmt #618

MarcoIeni opened this issue Apr 21, 2024 · 1 comment · May be fixed by #834
Assignees
@orhun
Labels
feature/request New feature or request good first issue Good for newcomers

Comments

@MarcoIeni
Copy link
Contributor

MarcoIeni commented Apr 21, 2024 •
edited
Loading

Is there an existing issue or pull request for this?

  • I have searched the existing issues and pull requests

Feature description

Not really a feature.
working with cargo nightly for cargo fmt is painful :(
Please, consider switching to stable to make the experience of contributors a bit better.

Desired solution

  • Remove rust-toolchain.toml file
  • Run cargo fmt

Downside: all opened PRs will have merge conflicts probably because stable uses spaces instead of tabs. So it's better to do this when there aren't big PRs opened.

Alternatives considered

The alternative is keeping the current configuration I guess.

Additional context

feedback coming from #613 (comment)
@MarcoIeni MarcoIeni added the feature/request New feature or request label Apr 21, 2024
@MarcoIeni MarcoIeni mentioned this issue Apr 21, 2024
Merged
12 tasks
@orhun orhun added the good first issue Good for newcomers label Apr 21, 2024
@MarcoIeni MarcoIeni linked a pull request Aug 31, 2024 that will close this issue
Open
12 tasks
@alerque
Copy link
Contributor

alerque commented Oct 2, 2024

Downside: all opened PRs will have merge conflicts probably because stable uses spaces instead of tabs.

Merge conflicts for this (and other similar cases where deterministic tooling is used to restyle code) by applying the new formatting rules at the end of the PR/branch before attempting to merge. Optionally this can be later squashed in with the merge commit itself so that the merge diff only shows what the PR brought to the table after all the formatting matched on both sides. If a rebase is preferred this can be done by applying formatting on each commit in the branch in reverse order (branch HEAD first, then working backwards).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@orhun orhun

Labels
feature/request New feature or request good first issue Good for newcomers
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

chore: use stable rustfmt MarcoIeni/git-cliff
3 participants
@alerque @MarcoIeni @orhun