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

Move dependencies into workspace #1955

Merged
merged 8 commits into from
Dec 19, 2023
Merged

Move dependencies into workspace #1955

merged 8 commits into from
Dec 19, 2023

Conversation

fridrik01
Copy link
Contributor

@fridrik01 fridrik01 commented Dec 15, 2023

This PR moves all dependencies and metadata (version, license, etc) to the root workspace so that we can manage them in a central place.

@codecov-commenter
Copy link

codecov-commenter commented Dec 15, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a8f9be1) 75.79% compared to head (534e7c5) 75.59%.
Report is 3 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1955      +/-   ##
==========================================
- Coverage   75.79%   75.59%   -0.20%     
==========================================
  Files         157      157              
  Lines       15441    15490      +49     
==========================================
+ Hits        11703    11710       +7     
- Misses       3738     3780      +42     

see 8 files with indirect coverage changes

@fridrik01 fridrik01 force-pushed the cargo-workspace branch 5 times, most recently from 0800404 to 92c0582 Compare December 15, 2023 17:28
also needed to rename kamt/fuzz/simple and hamt/fuzz/simple targets
as they were colliding using a single workspace
@fridrik01 fridrik01 changed the title [WIP] Use workspace dependencies in subcrates Use workspace dependencies in subcrates Dec 18, 2023
@fridrik01 fridrik01 changed the title Use workspace dependencies in subcrates Move dependencies into workspace Dec 18, 2023
@fridrik01 fridrik01 marked this pull request as ready for review December 18, 2023 13:34
fvm/Cargo.toml Show resolved Hide resolved
Comment on lines -21 to -22
[workspace]
members = ["."]
Copy link
Member

Choose a reason for hiding this comment

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

Ah.... I think this may have been why we didn't include this in the workspace. We need to check the cargo tree (and enabled features) in the workspace itself to make sure we're not "unifying" them. I'll go ahead and do that.

Copy link
Member

Choose a reason for hiding this comment

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

Basically, look up "feature unification in rust" if you want to have bad dreams.

Copy link
Member

Choose a reason for hiding this comment

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

Hm. Actually... this seems fine? I thought I saw the arbitrary feature/crates getting included in the main dependency tree... but now I'm not seeing that.

@Stebalien
Copy link
Member

Stebalien commented Dec 18, 2023

Ok, so, I think this actually works. But is there any reason not to migrate the rest of the deps (e.g., wat in the integration tests, the rest of the fvm dependencies, etc.

Are we just moving "shared" deps?

@fridrik01
Copy link
Contributor Author

Ok, so, I think this actually works. But is there any reason not to migrate the rest of the deps (e.g., wat in the integration tests, the rest of the fvm dependencies, etc.

Are we just moving "shared" deps?

Yeah, I skipped moving dependencies that only were used in one crate into the root workspace

@Stebalien Stebalien merged commit ad0a396 into master Dec 19, 2023
14 checks passed
@Stebalien Stebalien deleted the cargo-workspace branch December 19, 2023 16:36
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.

3 participants