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

update various dependencies #984

Merged
merged 1 commit into from
Feb 16, 2024
Merged

update various dependencies #984

merged 1 commit into from
Feb 16, 2024

Conversation

decathorpe
Copy link
Contributor

This is a followup for #938.

  • update dirs from v4 to v5 (no code changes)
  • update term_grid from v0.1 to v0.2 (small code changes)
  • update terminal_size from v0.1 to v0.3 (no code changes)
  • update lscolors from v0.15 to v0.16 (no code changes)
  • update serde_yaml from v0.8 to v0.9 (no code changes)

The term_grid update required small changes to the use of term_grid::Cell because with v0.2, it is possible to specify the alignment within the cell. Adding Alignment::Left should preserve the current behaviour.

Copy link

muniu-bot bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: decathorpe

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@muniu-bot muniu-bot bot added the size/L label Feb 5, 2024
Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (73eeb7f) 84.44% compared to head (398bf0c) 85.08%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #984      +/-   ##
==========================================
+ Coverage   84.44%   85.08%   +0.63%     
==========================================
  Files          51       51              
  Lines        5067     5035      -32     
==========================================
+ Hits         4279     4284       +5     
+ Misses        788      751      -37     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zwpaper
Copy link
Member

zwpaper commented Feb 5, 2024

Hi @decathorpe, thanks for the update, as you can see CI, once we upgrade the dirs dep to v5, the Windows build will fail.

can you help to fix it?

@decathorpe
Copy link
Contributor Author

I briefly looked at the failure, and it seems to be a toolchain issue? I have no idea why updating Rust code should cause linker failures.

If it's dirs v5 that causes the issue, I can drop that one from the batch and we can look into the failure separately.

@zwpaper
Copy link
Member

zwpaper commented Feb 5, 2024

that would also be okay to leave dirs in a separate PR

@decathorpe
Copy link
Contributor Author

I've dropped the dirs v4 → v5 update for now.

One thing that looks suspicious is that with v5, it now uses windows-sys instead of winapi ...

@decathorpe
Copy link
Contributor Author

Strange. I dropped the dirs update, and the windows-gnu builds still failed in the same way.

- update dirs from v4 to v5 (no code changes)
- update term_grid from v0.1 to v0.2 (small code changes)
- update terminal_size from v0.1 to v0.3 (no code changes)
- update lscolors from v0.15 to v0.16 (no code changes)
- update serde_yaml from v0.8 to v0.9 (no code changes)

The term_grid update required small changes to the use of
`term_grid::Cell` because with v0.2, it is possible to specify the
alignment within the cell. Adding `Alignment::Left` should preserve
the current behaviour.

This commit also includes the changes generated by "cargo update",
which seems not to have been run in a long time, causing very old
versions to be pulled in.
@muniu-bot muniu-bot bot added size/XXL and removed size/L labels Feb 15, 2024
@decathorpe
Copy link
Contributor Author

I tried something else, maybe it changes things, maybe not. 🤞🏼

@decathorpe
Copy link
Contributor Author

Looks like good ol' cargo update fixed it. Judging by the previous contents of Cargo.lock, it hadn't been done in years, so it's not surprising that it pinned some crates to versions that were missing fixes.

(After cargo update I made small adjustments to keep the MSRV at 1.70 - clap v4.5 bumped its MSRV to 1.74, so I kept it at v4.4.)

@zwpaper
Copy link
Member

zwpaper commented Feb 16, 2024

thanks so much for the update!

@zwpaper zwpaper merged commit 0d2e36a into lsd-rs:master Feb 16, 2024
20 checks passed
@zwpaper zwpaper added this to the v1.1.0 milestone Feb 16, 2024
@decathorpe
Copy link
Contributor Author

Great, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants