Make `rkyv` feature imply `size_32` #1383

pitdicker · 2024-01-24T15:17:33Z

Should fix the build failure on docs.rs, see #1368 (comment) and #1380.

codecov · 2024-01-24T15:20:29Z

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (bf70419) 91.69% compared to head (09a8da0) 91.72%.
Report is 1 commits behind head on 0.4.x.

Files	Patch %	Lines
src/datetime/mod.rs	0.00%	1 Missing ⚠️
src/offset/utc.rs	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            0.4.x    #1383      +/-   ##
==========================================
+ Coverage   91.69%   91.72%   +0.03%     
==========================================
  Files          38       38              
  Lines       17608    17267     -341     
==========================================
- Hits        16145    15839     -306     
+ Misses       1463     1428      -35

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

djc · 2024-01-24T15:21:21Z

Could we instead change our feature forwarding so that rkyv implies size_32 (the upstream default)? That would unbreak other users.

pitdicker · 2024-01-24T15:28:59Z

I don't think we can because the feature name rkyv is the same as the name op the optional dependency. But you maybe know better what cargo supports when it comes to specifying dependencies than I do.

djc · 2024-01-24T15:30:51Z

We can write rkyv = ['dep:rkyv', 'rkyv/size_32'] if our MSRV is new enough (which I think it is?).

pitdicker · 2024-01-24T15:32:28Z

I'll give it a try.

djc

Nice!

pitdicker · 2024-01-24T15:50:03Z

Now that features rkyv-validation, rkyv-16, etc. no longer imply the rkyv feature it fails to build. Let me give it one more round 😄.

pitdicker · 2024-01-24T16:14:43Z

Do we want to bump to 0.4.33 in this PR?

djc

Do we want to bump to 0.4.33 in this PR?

Yes, please!

Cargo.toml

djc · 2024-01-24T20:28:41Z

Cargo.toml

+rkyv-16 = ["dep:rkyv", "rkyv?/size_16"]
+rkyv-32 = ["dep:rkyv", "rkyv?/size_32"]
+rkyv-64 = ["dep:rkyv", "rkyv?/size_64"]
+rkyv-validation = ["dep:rkyv", "rkyv?/validation"]


So I think this one is now odd because rkyv-validation doesn't pick a size? I'd propose that we leave dep:rkyv out of rkyv-validation and only leave rkyv?/validation in there so that it will only activate the downstream feature if any of the other features have been used to enable rkyv (and pick a size).

I tried both of your suggestions, but then it doesn't work out for all combinations:

cargo check --features=rkyv-64,rkyv-validation Checking rkyv v0.7.43 error: "size_32" and "size_64" are mutually-exclusive features. You may need to set `default-features = false` or compile with `--no-default-features`. --> C:\Users\paul\.cargo\registry\src\index.crates.io-6f17d22bba15001f\rkyv-0.7.43\src\macros.rs:127:1 | 127 | / core::compile_error!( 128 | | "\"size_32\" and \"size_64\" are mutually-exclusive features. You may need to set \ 129 | | `default-features = false` or compile with `--no-default-features`." 130 | | ); | |_^ error: could not compile `rkyv` (lib) due to previous error

I think we can make do without the validation -> dep:rkyv edge? It seems to work for me.

src/month.rs

pitdicker · 2024-01-25T07:48:38Z

Set the date to today. Do we want to get #1384 in first?

djc · 2024-01-25T12:35:11Z

Published to crates.io, thanks!

pitdicker · 2024-01-25T12:39:28Z

That is quick. You too!

pitdicker · 2024-01-25T12:40:16Z

And we have docs again https://docs.rs/chrono/0.4.33/chrono/

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [chrono](https://github.com/chronotope/chrono) | workspace.dependencies | patch | `0.4.32` -> `0.4.33` | --- ### Release Notes <details> <summary>chronotope/chrono (chrono)</summary> ### [`v0.4.33`](https://github.com/chronotope/chrono/releases/tag/v0.4.33): 0.4.33 [Compare Source](https://github.com/chronotope/chrono/compare/v0.4.32...v0.4.33) #### What's Changed - Fixed typo in Duration::hours() exception by [@danwilliams](https://github.com/danwilliams) in [https://github.com/chronotope/chrono/pull/1384](https://github.com/chronotope/chrono/pull/1384) - Make `rkyv` feature imply `size_32` by [@pitdicker](https://github.com/pitdicker) in [https://github.com/chronotope/chrono/pull/1383](https://github.com/chronotope/chrono/pull/1383) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/matter-labs/zksync-withdrawal-finalizer).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [chrono](https://github.com/chronotope/chrono) | dev-dependencies | patch | `0.4.32` -> `0.4.33` | --- ### Release Notes <details> <summary>chronotope/chrono (chrono)</summary> ### [`v0.4.33`](https://github.com/chronotope/chrono/releases/tag/v0.4.33): 0.4.33 [Compare Source](https://github.com/chronotope/chrono/compare/v0.4.32...v0.4.33) #### What's Changed - Fixed typo in Duration::hours() exception by [@danwilliams](https://github.com/danwilliams) in [https://github.com/chronotope/chrono/pull/1384](https://github.com/chronotope/chrono/pull/1384) - Make `rkyv` feature imply `size_32` by [@pitdicker](https://github.com/pitdicker) in [https://github.com/chronotope/chrono/pull/1383](https://github.com/chronotope/chrono/pull/1383) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 9pm,before 6am" in timezone Europe/Zurich, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/smartive/zitadel-rust).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

pitdicker force-pushed the docsrs_rkyv_feature branch from 606754d to 75c1121 Compare January 24, 2024 15:42

djc approved these changes Jan 24, 2024

View reviewed changes

pitdicker force-pushed the docsrs_rkyv_feature branch from 75c1121 to f0cf98c Compare January 24, 2024 16:09

pitdicker changed the title ~~Change docs.rs feature to use rkyv-64~~ Make rkyv feature implie size_32 Jan 24, 2024

pitdicker changed the title ~~Make rkyv feature implie size_32~~ Make rkyv feature imply size_32 Jan 24, 2024

Don't assume rkyv-(16|32|64) implies the rkyv feature

b980068

pitdicker force-pushed the docsrs_rkyv_feature branch from f0cf98c to b59d3c9 Compare January 24, 2024 20:27

djc reviewed Jan 24, 2024

View reviewed changes

pitdicker commented Jan 24, 2024

View reviewed changes

src/month.rs Show resolved Hide resolved

pitdicker force-pushed the docsrs_rkyv_feature branch from d7b244e to c67019b Compare January 25, 2024 07:46

pitdicker added 2 commits January 25, 2024 13:12

Make rkyv feature default to size_32

9566bea

Prepare 0.4.33 release

09a8da0

pitdicker force-pushed the docsrs_rkyv_feature branch from c67019b to 09a8da0 Compare January 25, 2024 12:13

djc merged commit 7c419a3 into chronotope:0.4.x Jan 25, 2024
36 of 37 checks passed

pitdicker deleted the docsrs_rkyv_feature branch January 25, 2024 12:39

pitdicker mentioned this pull request Jan 25, 2024

Uhm build fails? #1380

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make `rkyv` feature imply `size_32` #1383

Make `rkyv` feature imply `size_32` #1383

pitdicker commented Jan 24, 2024 •

edited by djc

Loading

codecov bot commented Jan 24, 2024 •

edited

Loading

djc commented Jan 24, 2024

pitdicker commented Jan 24, 2024

djc commented Jan 24, 2024

pitdicker commented Jan 24, 2024

djc left a comment

pitdicker commented Jan 24, 2024 •

edited

Loading

pitdicker commented Jan 24, 2024

djc left a comment

djc Jan 24, 2024

pitdicker Jan 24, 2024

djc Jan 25, 2024

pitdicker Jan 25, 2024

pitdicker commented Jan 25, 2024

djc commented Jan 25, 2024

pitdicker commented Jan 25, 2024

pitdicker commented Jan 25, 2024

Make rkyv feature imply size_32 #1383

Make rkyv feature imply size_32 #1383

Conversation

pitdicker commented Jan 24, 2024 • edited by djc Loading

codecov bot commented Jan 24, 2024 • edited Loading

Codecov Report

djc commented Jan 24, 2024

pitdicker commented Jan 24, 2024

djc commented Jan 24, 2024

pitdicker commented Jan 24, 2024

djc left a comment

Choose a reason for hiding this comment

pitdicker commented Jan 24, 2024 • edited Loading

pitdicker commented Jan 24, 2024

djc left a comment

Choose a reason for hiding this comment

djc Jan 24, 2024

Choose a reason for hiding this comment

pitdicker Jan 24, 2024

Choose a reason for hiding this comment

djc Jan 25, 2024

Choose a reason for hiding this comment

pitdicker Jan 25, 2024

Choose a reason for hiding this comment

pitdicker commented Jan 25, 2024

djc commented Jan 25, 2024

pitdicker commented Jan 25, 2024

pitdicker commented Jan 25, 2024

Make `rkyv` feature imply `size_32` #1383

Make `rkyv` feature imply `size_32` #1383

pitdicker commented Jan 24, 2024 •

edited by djc

Loading

codecov bot commented Jan 24, 2024 •

edited

Loading

pitdicker commented Jan 24, 2024 •

edited

Loading