remove View; allow rendering Result
Some checks failed
/ build (push) Has been cancelled

This commit is contained in:
🪞👃🪞 2025-05-19 02:23:26 +03:00
parent 90f5699fff
commit f08593f0f8
5 changed files with 64 additions and 89 deletions

View file

@ -44,7 +44,7 @@ impl Parse for ViewImpl {
impl ToTokens for ViewDef {
fn to_tokens (&self, out: &mut TokenStream2) {
let Self(ViewMeta { output }, ViewImpl { block, exposed }) = self;
let ident = &block.self_ty;
let view = &block.self_ty;
let mut available = vec![];
let exposed: Vec<_> = exposed.iter().map(|(k,v)|{
available.push(k.clone());
@ -52,24 +52,24 @@ impl ToTokens for ViewDef {
}).collect();
let available: String = available.join(", ");
let error_msg = LitStr::new(
&format!("expected Sym(content), got: {{iter:?}}, available: {available}"),
&format!("expected Sym(content), got: {{token:?}}, available: {available}"),
Span::call_site()
);
for token in quote! {
#block
/// Generated by [tengri_proc].
impl ::tengri::output::Content<#output> for #ident {
impl ::tengri::output::Content<#output> for #view {
fn content (&self) -> impl Render<#output> {
// TODO move to self.view()
self.size.of(::tengri::output::View(self, self.config.view))
self.view()
}
}
/// Generated by [tengri_proc].
impl<'state> ::tengri::output::ViewContext<'state, #output> for #ident {
fn get_content_sym <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
-> ::tengri::Perhaps<RenderBox<'state, #output>>
{
Ok(match iter.peek() { #(#exposed)* _ => panic!(#error_msg) })
impl<'state> ::tengri::dsl::FromDsl<'state, #view> for ::tengri::output::RenderBox<'state, #output> {
fn take_from <'source: 'state> (
state: &'state #view,
token: &mut ::tengri::dsl::TokenIter<'source>
) -> Perhaps<Self> {
Ok(match token.peek() { #(#exposed)* _ => None })
}
}
} {
@ -126,7 +126,7 @@ impl ToTokens for ViewArm {
out.append(Ident::new("Some", Span::call_site()));
out.append(Group::new(Delimiter::Parenthesis, {
let mut out = TokenStream2::new();
out.append(Ident::new("self", Span::call_site()));
out.append(Ident::new("state", Span::call_site()));
out.append(Punct::new('.', Alone));
out.append(value.clone());
out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));