aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Fischer <martin@push-f.com>2021-11-21 19:52:30 +0100
committerMartin Fischer <martin@push-f.com>2021-11-21 19:54:46 +0100
commit0dd8413eca378e5dc2e6cbdc6f9c6f8bde604e4a (patch)
treee191baf60e478ed040c6a865cb7676f3465860b4 /src
parent23fcd4ef079ad2b4aed69b4f363cbb9e7102c4ed (diff)
support boxed Iterator in Option
Diffstat (limited to 'src')
-rw-r--r--src/lib.rs4
-rw-r--r--src/parse_assoc_type.rs17
-rw-r--r--src/parse_trait_sig.rs2
-rw-r--r--src/transform.rs13
4 files changed, 22 insertions, 14 deletions
diff --git a/src/lib.rs b/src/lib.rs
index fc81e42..1f75023 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -390,9 +390,9 @@ impl TypeTransform {
let inner = opt.convert(quote!(x));
quote! {#arg.map(|x| #inner)}
}
- TypeTransform::Iterator(inner) => {
+ TypeTransform::Iterator(box_type, inner) => {
let inner = inner.convert(quote!(x));
- quote! {Box::new(#arg.map(|x| #inner))}
+ quote! {Box::new(#arg.map(|x| #inner)) as #box_type}
}
TypeTransform::Result(ok, err) => {
let map_ok = !matches!(ok.as_ref(), TypeTransform::NoOp);
diff --git a/src/parse_assoc_type.rs b/src/parse_assoc_type.rs
index 85f3723..048e58c 100644
--- a/src/parse_assoc_type.rs
+++ b/src/parse_assoc_type.rs
@@ -1,7 +1,7 @@
-use proc_macro2::Span;
+use proc_macro2::{Span, TokenStream};
use quote::{quote, ToTokens};
use syn::spanned::Spanned;
-use syn::{GenericArgument, Ident, Path, PathArguments, PathSegment, TraitItemType, Type};
+use syn::{GenericArgument, Ident, PathArguments, PathSegment, TraitItemType, Type};
use crate::match_assoc_type;
use crate::parse_trait_sig::TypeTransform;
@@ -16,16 +16,16 @@ pub enum AssocTypeParseError {
#[derive(Debug, Clone)]
pub struct BoxType {
- trait_name: Path,
- placeholder_lifetime: bool,
+ pub inner: TokenStream,
+ pub placeholder_lifetime: bool,
}
impl ToTokens for BoxType {
fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
- let path = &self.trait_name;
+ let inner = &self.inner;
match self.placeholder_lifetime {
- true => tokens.extend(quote! {Box<dyn #path + '_>}),
- false => tokens.extend(quote! {Box<dyn #path>}),
+ true => tokens.extend(quote! {Box<#inner + '_>}),
+ false => tokens.extend(quote! {Box<#inner>}),
}
}
}
@@ -79,10 +79,11 @@ pub fn parse_assoc_type(
}
}
}
+ let path = &bound.path;
return Ok((
&assoc_type.ident,
DestType::Box(BoxType {
- trait_name: bound.path.clone(),
+ inner: quote! {dyn #path},
placeholder_lifetime: !lifetime_bounds(&assoc_type.bounds)
.any(|l| l.ident == "static"),
}),
diff --git a/src/parse_trait_sig.rs b/src/parse_trait_sig.rs
index cf2d7da..ab2c437 100644
--- a/src/parse_trait_sig.rs
+++ b/src/parse_trait_sig.rs
@@ -17,7 +17,7 @@ pub enum TypeTransform {
Into,
Box(BoxType),
Map(Box<TypeTransform>),
- Iterator(Box<TypeTransform>),
+ Iterator(BoxType, Box<TypeTransform>),
Result(Box<TypeTransform>, Box<TypeTransform>),
}
diff --git a/src/transform.rs b/src/transform.rs
index fff9c6c..69929cc 100644
--- a/src/transform.rs
+++ b/src/transform.rs
@@ -9,7 +9,7 @@ use syn::{
use crate::{
filter_map_assoc_paths, match_assoc_type,
- parse_assoc_type::DestType,
+ parse_assoc_type::{BoxType, DestType},
parse_trait_sig::{MethodParseError, TypeTransform},
syn_utils::{iter_path, iter_type},
};
@@ -56,8 +56,15 @@ impl AssocTypeConversions<'_> {
{
let inner =
self.parse_type_path(&mut binding.ty)?;
- *type_ = Type::Verbatim(quote! {Box<#elem + '_>});
- return Ok(TypeTransform::Iterator(inner.into()));
+ let box_type = BoxType {
+ inner: quote! {#elem},
+ placeholder_lifetime: true,
+ };
+ *type_ = Type::Verbatim(quote! {#box_type});
+ return Ok(TypeTransform::Iterator(
+ box_type,
+ inner.into(),
+ ));
}
}
}