berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

contracts: Improve abstract type detection (i.e. containing impl) 

Now it also checks for if there's an impl inside the type, not only on
the outside.
This commit is contained in:
Mikolaj Wielgus 2023-09-16 23:08:20 +02:00
parent 394510de8d
commit d7b5640a25
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vendor/contracts/src/implementation/codegen.rs vendored
View File

@ -6,7 +6,7 @@ use proc_macro2::{Ident, Span, TokenStream};
use quote::ToTokens; use quote::ToTokens;
use syn::{ use syn::{
spanned::Spanned, visit_mut as visitor, Attribute, Expr, ExprCall, spanned::Spanned, visit_mut as visitor, Attribute, Expr, ExprCall,
ReturnType, Type, ReturnType, TypeImplTrait,
}; };
use crate::implementation::{ use crate::implementation::{
@ -321,12 +321,18 @@ pub(crate) fn generate(
let body = 'blk: { let body = 'blk: {
let mut block = func.function.block.clone(); let mut block = func.function.block.clone();
syn::visit_mut::visit_block_mut(&mut ReturnReplacer {}, &mut block); syn::visit_mut::visit_block_mut(&mut ReturnReplacer, &mut block);
if let ReturnType::Type(.., ref return_type) = func.function.sig.output let mut impl_detector = ImplDetector { found_impl: false };
{ syn::visit::visit_return_type(
if let Type::ImplTrait(..) = **return_type { &mut impl_detector,
} else { &func.function.sig.output,
);
if !impl_detector.found_impl {
if let ReturnType::Type(.., ref return_type) =
func.function.sig.output
{
break 'blk quote::quote! { let ret: #return_type = 'run: #block; }; break 'blk quote::quote! { let ret: #return_type = 'run: #block; };
} }
} }
@ -365,7 +371,7 @@ pub(crate) fn generate(
func.function.into_token_stream() func.function.into_token_stream()
} }
struct ReturnReplacer {} struct ReturnReplacer;
impl syn::visit_mut::VisitMut for ReturnReplacer { impl syn::visit_mut::VisitMut for ReturnReplacer {
fn visit_expr_mut(&mut self, node: &mut Expr) { fn visit_expr_mut(&mut self, node: &mut Expr) {
@ -375,3 +381,13 @@ impl syn::visit_mut::VisitMut for ReturnReplacer {
} }
} }
} }
struct ImplDetector {
found_impl: bool,
}
impl<'a> syn::visit::Visit<'a> for ImplDetector {
fn visit_type_impl_trait(&mut self, _node: &'a TypeImplTrait) {
self.found_impl = true;
}
}