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

Support configurable timestamps in git blame output (#1157) #1158

Merged
merged 3 commits into from
Aug 16, 2022
Merged

Support configurable timestamps in git blame output (#1157) #1158

merged 3 commits into from
Aug 16, 2022

Conversation

mliszcz
Copy link
Contributor

@mliszcz mliszcz commented Aug 11, 2022

New CLI/config option is introduced: blame-timestamp-output-format.

Fixes #1157.

@mliszcz
Support configurable timestamps in git blame output (dandavison#1157)
c03600e 
New CLI/config option is introduced: blame-timestamp-output-format.

Fixes dandavison#1157.
@mliszcz
Copy link
Contributor Author

mliszcz commented Aug 16, 2022

@dandavison could you please have a look at clippy output? I believe my code does not trigger any of those:

error: you are deriving `PartialEq` and can implement `Eq`

I noticed the same errors in two other recent PRs:
https://github.com/dandavison/delta/actions/workflows/ci.yml

I do not see any clippy errors when running locally with:

cargo 1.62.1 (a748cf5a3 2022-06-08)
rustc 1.62.1 (e092d0b6b 2022-07-16)
clippy 0.1.62 (e092d0b 2022-07-16)

@mliszcz
Copy link
Contributor Author

mliszcz commented Aug 16, 2022

Okay, it turns out that these clippy errors appear after upgrade to rust 1.63.0. There was a release on Thursday last week and since the CI pipeline is using 'stable' channel it was impacted.

@dandavison
Copy link
Owner

Hi @mliszcz, your changes look great -- sorry for being slow to review properly, I'm a bit swamped with the day job as usual.

And thanks for looking into the clippy errors. You don't need to address them (but of course if you feel like fixing them, in this PR or a separate one, you would be very welcome!).

@mliszcz
Copy link
Contributor Author

mliszcz commented Aug 16, 2022

Thanks for having a look. I will fix these clippy errors later today in a new commit in this PR. This should be straightforward, I can see that clippy already suggest fixes for most of them.

@mliszcz
Fix clippy warnings after rust 1.63 upgrade
e3fe9ec 
Following fixes are included:

* derive_partial_eq_without_eq:
  Eq trait was added by running `cargo clippy --fix --no-deps`.
* get_first:
  Function was replaced by running `cargo clippy --fix --no-deps`.
* unnecessary_to_owned:
  This check was disabled for ANSIString as to_string call is required
  to enforce formatting. Otherwise the underlying string was returned
  directly (probably due to Deref implementation).
* type_complexity:
  Closure type was simplified and Box<> usage was removed.
@dandavison
Copy link
Owner

Thanks very much for this work @mliszcz. I didn't see any improvements to suggest in your blame changes. And thanks very much for fixing (and explaining) the clippy issues.

@dandavison dandavison merged commit b99e6c5 into dandavison:master Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

🚀 Configurable timestamp output format in git blame
2 participants
@mliszcz @dandavison