Get rid of the lifetime on DataPayload/DataProvider/DataExporter #1297
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Manishearth
requested review from
aethanyc,
dminor,
filmil,
gregtatum,
makotokato,
nordzilla,
sffc,
zbraniecki and
a team
as code owners
Manishearth
commented
Nov 15, 2021
| where | ||
| M: DataMarker, | ||
| { | ||
| RcStruct(Yoke<M::Yokeable, ErasedCart<'data>>), | ||
| RcStruct(Yoke<M::Yokeable, ErasedCart<'static>>), |
There was a problem hiding this comment.
I didn't remove the lifetime from ErasedCart since I'll probably do that when we remove RcStruct (and move ErasedStruct to yoke)
sffc
reviewed
Nov 15, 2021
| use crate::data_provider::{DataPayloadInner, ErasedCart}; | ||
| let yoke: Yoke<_, ErasedCart> = match other.inner { | ||
| DataPayloadInner::RcStruct(yoke) => { | ||
| let rc: Rc<Yoke<_, _>> = Rc::from(yoke); | ||
| let yoke = | ||
| Yoke::attach_to_rc_cart(rc.clone() as Rc<dyn SerdeSeDataStruct<'data> + 'data>); | ||
| Yoke::attach_to_rc_cart(rc.clone() as Rc<dyn SerdeSeDataStruct<'static>>); |
There was a problem hiding this comment.
Request: Try to see if it's possible to get rid of the lifetime on SerdeSeDataStruct.
There was a problem hiding this comment.
I plan to do this immediately in a followup, this change was not necessary to land the rest of this so I didn't do it.
Manishearth
force-pushed
the
no-more-lifetime
branch
from
72d6805
to
e50292e
Compare
|
Notice: the branch changed across the force-push!
~ Your Friendly Jira-GitHub PR Checker Bot |
sffc
previously approved these changes
Nov 15, 2021
Manishearth
force-pushed
the
no-more-lifetime
branch
from
e50292e
to
ac743cb
Compare
|
Notice: the branch changed across the force-push!
~ Your Friendly Jira-GitHub PR Checker Bot |
zbraniecki
approved these changes
Nov 15, 2021
This was referenced Nov 15, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Progress on #1262
RcStructis now pretty useless but this PR doesn't yet remove it to reduce the amount of actual changes.The actual changes here are:
DataPayload,DataProvider,DataExporterno longer have lifetimes (and as a result all the formatters/etc don't either)Everything else is mostly just updates to bring the uses of these types in line with the changes