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

Add minimal support for flattening roundtrips through maps #453

Closed
wants to merge 1 commit into from

Conversation

juntyr
Copy link
Member

@juntyr juntyr commented Apr 23, 2023

Alternative to #403 which adds minimal support for #[serde(flatten)] to RON. Instead of many workarounds to make flattened structs serialise into nice RON struct syntax and deserialise from them, both of which are really difficult since serde gives us no information to work with and just delegates to map serialisation/deserialisation, this PR just ensures that at least flattened structs can roundtrip through RON.

For this, just one hack is necessary. Map keys that request identifiers can now be deserialised from strings, sort of. But only if they are written exactly as ", identifier, ". This seems to be enough to get the tests to work that I initially designed for #403.

@torkleyy I'd be in favour of landing this instead of going down the rabbit hole of #403 since that just fixes one of the two parts and getting flattened structs to serialise correctly would require hacks of another order.

This would not really fix #115 but at least get some working if imperfect solution.

  • I've included my change in CHANGELOG.md

@codecov-commenter
Copy link

Codecov Report

Patch coverage: 96.92% and project coverage change: -0.09 ⚠️

Comparison is base (484fcab) 86.65% compared to head (5f561ed) 86.56%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #453      +/-   ##
==========================================
- Coverage   86.65%   86.56%   -0.09%     
==========================================
  Files          60       61       +1     
  Lines        7364     7586     +222     
==========================================
+ Hits         6381     6567     +186     
- Misses        983     1019      +36     
Impacted Files Coverage Δ
src/de/mod.rs 74.23% <83.78%> (-2.69%) ⬇️
tests/115_minimal_flattening.rs 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@juntyr juntyr self-assigned this Apr 23, 2023
@clouds56
Copy link
Contributor

you could cherry-pick #454 here?

@juntyr
Copy link
Member Author

juntyr commented Apr 24, 2023

you could cherry-pick #454 here?

I could if you prefer that. However, we could also land #454 with some minor changes :)

@clouds56
Copy link
Contributor

Sure, just go ahead.
I'm hurt by serde and need some rest.

@juntyr
Copy link
Member Author

juntyr commented Apr 24, 2023

Sure, just go ahead.
I'm hurt by serde and need some rest.

Ok, I'll cherry pick your changes later today :)

@juntyr
Copy link
Member Author

juntyr commented Apr 24, 2023

Superseded by #455

@juntyr juntyr closed this Apr 24, 2023
@juntyr juntyr deleted the 115-minimal-flattening branch May 1, 2023 10:34
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.

Struct flattening not working
3 participants