Skip to content

[draft] Rework of repository layout#14

Merged
spirali merged 9 commits into
mainfrom
rework
Jan 26, 2025
Merged

[draft] Rework of repository layout#14
spirali merged 9 commits into
mainfrom
rework

Conversation

@spirali

@spirali spirali commented Jan 9, 2025

Copy link
Copy Markdown
Collaborator

If is continuation of #12. Very incomplete so far, I am now experimenting with different basic types. I am creating this PR for others to see what progress was made.

@spirali

spirali commented Jan 23, 2025

Copy link
Copy Markdown
Collaborator Author

@DJMcNab The current version is ready for review.

  • It fails for wasm target (because kompari-html for review depends on tokio that is not compilable for wasm target, previously I disabled feature "review" in CI for wasm, I am now not sure how to do it properly for whole crate)
  • I have disabled Clippy flags for checking metadata because it warns about missing package metadata like description, etc, but they are there (false warnings?)
  • I have disabled Clippy flags for missing documentation. I will write docs when we agree on this project structure.

@DJMcNab DJMcNab left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

A few nits, all of which I'm happy to defer, but most of which it would probably be easier to do in this PR anyway.

Thank you so much for taking this on - this should make Kompari much more approachable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The other thing which might be worth changing is making the example test use the "base" Kompari for some/most of its logic.

Deferring that would be fine

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Created #15 to not forget about it.

Comment thread kompari-cli/Cargo.toml Outdated
Comment thread kompari-cli/Cargo.toml Outdated
Comment thread kompari-cli/Cargo.toml
Comment thread kompari-cli/src/main.rs Outdated
Comment thread kompari-cli/src/main.rs Outdated
Comment thread kompari/src/fsutils.rs Outdated
Comment thread kompari/src/imgdiff.rs Outdated
Comment thread kompari/src/lib.rs
Comment thread kompari/tests/compare.rs
@DJMcNab

DJMcNab commented Jan 23, 2025

Copy link
Copy Markdown
Member

The right solution for WASM I think is to make it so that the only package tested for wasm is the Kompari one. See for example https://github.com/linebender/xilem/blob/8342d8f3d5d1c3f3492c20d245c5704992bc9f8e/.github/workflows/ci.yml#L13

@spirali
spirali force-pushed the rework branch 2 times, most recently from 5b5ea7a to 6e14727 Compare January 25, 2025 17:12
@spirali

spirali commented Jan 25, 2025

Copy link
Copy Markdown
Collaborator Author

The last issue in CI is now:

lock file version `4` was found, but this version of Cargo does not understand this lock file, perhaps Cargo needs to be updated?

Do you know how to solve it in CI?

@DJMcNab

DJMcNab commented Jan 25, 2025

Copy link
Copy Markdown
Member

Hmm. That error looks like rust-lang/cargo#14655

According to that PR, rust-lang/cargo#12861 should have made this impossible.
The first thing I'd try is deleting and recreating Cargo.lock, and seeing if that fixes it. I expect it to.

The next option would be to manually change the version in the lockfile.
The thing to do is just bump our MSRV to 1.78 (all of the crates we expect to use Kompari use Color already, so it's not a huge loss, and 1.83 was released)

@spirali
spirali added this pull request to the merge queue Jan 26, 2025
Merged via the queue into main with commit c7ddf03 Jan 26, 2025
@spirali
spirali deleted the rework branch January 26, 2025 11:01
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