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.

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

Use anyhow #84 #121

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Use anyhow #84 #121

merged 2 commits into from
Jun 6, 2024

Conversation

Its-Just-Nans
Copy link
Contributor

use anyhow for #84

https://github.com/ast-grep/ast-grep helped a lot :

sg -p 'Err($A)' -l rs -r 'Err($A.into())' -i

Note that there are some clippy fix like .first() instead of .get(0)

This is more like a draft, happy to have a feedback

Copy link
Collaborator

@gabhijit gabhijit left a comment

Choose a reason for hiding this comment

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

Thank you for the pull request!! This was pending for a while.

The changes look good. Can you please squash these into a single commit and then we can merge this.

@gabhijit
Copy link
Collaborator

gabhijit commented Jun 6, 2024

Thank you for the pull request!! This was pending for a while.

The changes look good. Can you please squash these into a single commit and then we can merge this.

Also, you might have to rebase with upstream master first.

Signed-off-by: n4n5 <its.just.n4n5@gmail.com>
Signed-off-by: n4n5 <its.just.n4n5@gmail.com>
@Its-Just-Nans
Copy link
Contributor Author

I think it's okay now

btw you can just squash with github ^^

image

@Its-Just-Nans Its-Just-Nans requested a review from gabhijit June 6, 2024 16:02
@gabhijit gabhijit merged commit dfc57b8 into ystero-dev:master Jun 6, 2024
3 checks passed
@gabhijit
Copy link
Collaborator

gabhijit commented Jun 6, 2024

I think it's okay now

btw you can just squash with github ^^

image

Oh I didn't know that. My usual flow is - when the branch is ready -

  1. git fetch origin
  2. get rebase -i origin/master
  3. select the commits that you want to squash into one
  4. Edit the final commit message
  5. git push --force origin/my-branch

This way the git log history is clean and only a few relevant commits are kept.

That's a bit cutomized so cannot be trivially done on GH UI.

I have used that for now. Guess this works fine for a couple of small commits etc.

Thank you for your contributions!

@Its-Just-Nans Its-Just-Nans deleted the use-anyhow branch June 6, 2024 16:49
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.

2 participants