[refactor]: Use context in IntoFfi #2633
Closed
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
github-actions
bot
added
the
iroha2-dev
mversic
force-pushed
the
refactor_into_ffi
branch
from
ed03bbb to
fab69d4
Compare
mversic
commented
Aug 17, 2022
mversic
force-pushed
the
refactor_into_ffi
branch
2 times, most recently
from
fc4d49c to
4a4a802
Compare
Erigara
reviewed
Aug 18, 2022
Erigara
reviewed
Aug 18, 2022
mversic
force-pushed
the
refactor_into_ffi
branch
20 times, most recently
from
799bab5 to
b9db95b
Compare
mversic
force-pushed
the
refactor_into_ffi
branch
from
b9db95b to
e93a7c5
Compare
mversic
commented
Aug 18, 2022
ffi/src/owned.rs
Outdated
| self.into_iter().map(IntoFfi::into_ffi).collect() | ||
| store | ||
| .0 | ||
| .insert(unsafe { data_store.as_ptr().cast::<[T::ReprC; N]>().read() }) |
There was a problem hiding this comment.
this should be fine?
There was a problem hiding this comment.
I think so, it's open issue about this.
We don't need to mem::forgot(data_store) since ReprC: Copy.
mversic
commented
Aug 18, 2022
ffi/src/lib.rs
Outdated
| /// Convert from &[`Self`] into [`Self::Target`]. | ||
| fn as_ref(&'itm self) -> Self::Target; | ||
| /// Type that can be returned from an FFI function via out-pointer function argument | ||
| pub trait Output: FfiType { |
There was a problem hiding this comment.
This trait is tricky, and might be too permissive, I should add tests as a guard
Erigara
reviewed
Aug 19, 2022
| } | ||
|
|
||
| // NOTE: Arrays must be converted into pointers | ||
| impl<T: IntoFfi, const N: usize> IntoFfi for [T; N] |
There was a problem hiding this comment.
I think now it's possible to convert [T;0] into ffi which could be problematic.
There was a problem hiding this comment.
if you still think this is an issue, I'd open an issue
There was a problem hiding this comment.
I second opening an issue.
ffi/src/owned.rs
Outdated
| self.into_iter().map(IntoFfi::into_ffi).collect() | ||
| store | ||
| .0 | ||
| .insert(unsafe { data_store.as_ptr().cast::<[T::ReprC; N]>().read() }) |
There was a problem hiding this comment.
I think so, it's open issue about this.
We don't need to mem::forgot(data_store) since ReprC: Copy.
mversic
force-pushed
the
refactor_into_ffi
branch
4 times, most recently
from
02f0f31 to
755e130
Compare
mversic
force-pushed
the
refactor_into_ffi
branch
2 times, most recently
from
3cfeb87 to
8c18da2
Compare
Signed-off-by: Marin Veršić <[email protected]>
mversic
force-pushed
the
refactor_into_ffi
branch
from
8c18da2 to
4bcbb9d
Compare
appetrosyan
reviewed
Aug 22, 2022
| @@ -96,7 +96,7 @@ impl AsRef<str> for Name { | |||
| impl FromStr for Name { | |||
| type Err = ParseError; | |||
|
|
|||
| fn from_str(candidate: &str) -> Result<Self, Self::Err> { | |||
| fn from_str(candidate: &str) -> Result<Self, <Self as FromStr>::Err> { | |||
| let arg_name = arg.name(); | ||
| let arg_type = arg.ffi_type_resolved(true); | ||
|
|
||
| let (arg_name, arg_type) = (arg.name(), arg.ffi_type_resolved(true)); |
There was a problem hiding this comment.
This doesn't really make it more readable (in fact, less).
| } | ||
|
|
||
| // NOTE: Arrays must be converted into pointers | ||
| impl<T: IntoFfi, const N: usize> IntoFfi for [T; N] |
There was a problem hiding this comment.
I second opening an issue.
Comment on lines
+95
to
+129
| // TODO: Be sure to match the bounds correctly | ||
| //impl<'itm, T> IntoFfiVec for &'itm T | ||
| //where | ||
| // Self: FfiVec<ReprC = <Self as FfiType>::ReprC>, | ||
| //{ | ||
| // type Store = (Vec<<Self as FfiVec>::ReprC>, Vec<<Self as IntoFfi>::Store>); | ||
| // | ||
| // fn into_ffi(source: Vec<Self>, store: &mut Self::Store) -> Local<SliceRef<Self::ReprC>> { | ||
| // store.0 = source | ||
| // .into_iter() | ||
| // .enumerate() | ||
| // .map(|(i, item)| IntoFfi::into_ffi(item, &mut store.1[i])) | ||
| // .collect(); | ||
| // | ||
| // Local(SliceRef::from_slice(&store.0)) | ||
| // } | ||
| //} | ||
| // | ||
| //impl<T: IntoFfiVec> IntoFfiVec for Vec<T> | ||
| //where | ||
| // Self: FfiVec<ReprC = SliceRef<T::ReprC>>, | ||
| //{ | ||
| // type Store = (Vec<<Self as FfiVec>::ReprC>, Vec<<T as IntoFfiVec>::Store>); | ||
| // | ||
| // fn into_ffi(source: Vec<Self>, store: &mut Self::Store) -> Local<SliceRef<Self::ReprC>> { | ||
| // store.0 = source | ||
| // .into_iter() | ||
| // .enumerate() | ||
| // .map(|(i, item)| IntoFfiVec::into_ffi(item, &mut store.1[i]).0) | ||
| // .collect(); | ||
| // | ||
| // Local(SliceRef::from_slice(&store.0)) | ||
| // } | ||
| //} | ||
|
|
There was a problem hiding this comment.
Add issue if commented code is to be merged. Add it to the epic.
Comment on lines
+311
to
+317
| // let mut i = 0; | ||
| // while let Some((first, rest)) = substore.split_first_mut() { | ||
| // let elem: &$ffi_ty<$($ty::ReprC,)*> = &slice[i]; | ||
| // res.push(Clone::clone(TryFromReprC::try_from_repr_c(elem, first)?)); | ||
| // substore = rest; | ||
| // i += 1; | ||
| // } |
There was a problem hiding this comment.
I'd recommend fixing this before merge. If you decide to merge as is, remove and create an issue.
Comment on lines
+407
to
+416
| //impl_tuple! {(A, B, C) -> FfiTuple3} | ||
| //impl_tuple! {(A, B, C, D) -> FfiTuple4} | ||
| //impl_tuple! {(A, B, C, D, E) -> FfiTuple5} | ||
| //impl_tuple! {(A, B, C, D, E, F) -> FfiTuple6} | ||
| //impl_tuple! {(A, B, C, D, E, F, G) -> FfiTuple7} | ||
| //impl_tuple! {(A, B, C, D, E, F, G, H) -> FfiTuple8} | ||
| //impl_tuple! {(A, B, C, D, E, F, G, H, I) -> FfiTuple9} | ||
| //impl_tuple! {(A, B, C, D, E, F, G, H, I, J) -> FfiTuple10} | ||
| //impl_tuple! {(A, B, C, D, E, F, G, H, I, J, K) -> FfiTuple11} | ||
| //impl_tuple! {(A, B, C, D, E, F, G, H, I, J, K, L) -> FfiTuple12} |
There was a problem hiding this comment.
No longer needed? It would be nice if we can automate this process.
|
closed in favor of #2625 |
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.
Description of the Change
Issue
Benefits
Possible Drawbacks
Usage Examples or Tests [optional]
Alternate Designs [optional]