Skip to content

feat: Group workspace crates first in top-level Cargo.toml and deduplicate yansi and toml dependencies#3214

Merged
Bravo555 merged 3 commits intothin-edge:mainfrom
Bravo555:chore/deps-format-and-dedup
Oct 30, 2024
Merged

feat: Group workspace crates first in top-level Cargo.toml and deduplicate yansi and toml dependencies#3214
Bravo555 merged 3 commits intothin-edge:mainfrom
Bravo555:chore/deps-format-and-dedup

Conversation

@Bravo555
Copy link
Copy Markdown
Member

@Bravo555 Bravo555 commented Oct 30, 2024 •
edited
Loading

Proposed changes

Separately group workspace crates and dependencies in top-level Cargo.toml so it's easier to see how many creates are ours and how many are external dependencies.

Also deduplicated two dependencies by aligning the versions we use with one used transitively by other dependencies.

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (general improvements like code refactoring that doesn't explicitly fix a bug or add any new functionality)
  • Documentation Update (if none of the other choices apply)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Paste Link to the issue


Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA (in all commits with git commit -s)
  • I ran cargo fmt as mentioned in CODING_GUIDELINES
  • I used cargo clippy as mentioned in CODING_GUIDELINES
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

@Bravo555
Group workspace crates first in dependencies section
9b31155 
This makes it easier to see which crates are ours and which are external
dependencies.

Signed-off-by: Marcel Guzik <marcel.guzik@inetum.com>
@Bravo555
Deduplicate yansi dependency
fc2138d 
One of our transitive dependencies used yansi@1.0.1, but our crates were
using 0.5, so by upgrading we avoid pulling in 2 separate versions.

Signed-off-by: Marcel Guzik <marcel.guzik@inetum.com>
@Bravo555
Deduplicate toml
66182db 
Signed-off-by: Marcel Guzik <marcel.guzik@inetum.com>
@Bravo555 Bravo555 temporarily deployed to Test Pull Request October 30, 2024 10:25 — with GitHub Actions Inactive
@Bravo555 Bravo555 added the dependencies Pull requests that update a dependency file label Oct 30, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Oct 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Additional details and impacted files

📢 Thoughts on this report? Let us know!

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 30, 2024

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
526 0 2 526 100 1h34m34.092654s

didier-wenzek
didier-wenzek approved these changes Oct 30, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@didier-wenzek didier-wenzek left a comment

Choose a reason for hiding this comment

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

Approved

@Bravo555 Bravo555 added this pull request to the merge queue Oct 30, 2024
Merged via the queue into thin-edge:main with commit de0373c Oct 30, 2024
@reubenmiller reubenmiller changed the title Group workspace crates first in top-level Cargo.toml and deduplicate yansi and toml dependencies feat: Group workspace crates first in top-level Cargo.toml and deduplicate yansi and toml dependencies Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@didier-wenzek didier-wenzek didier-wenzek approved these changes

@albinsuresh albinsuresh Awaiting requested review from albinsuresh albinsuresh is a code owner

@jarhodes314 jarhodes314 Awaiting requested review from jarhodes314 jarhodes314 is a code owner

@rina23q rina23q Awaiting requested review from rina23q rina23q is a code owner

@reubenmiller reubenmiller Awaiting requested review from reubenmiller reubenmiller is a code owner

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Bravo555 @didier-wenzek