finchie/new_manual - Change RAWT2FQSTIP6EWFQXMAESASEM6AIFCV4PDO6TRUN6EAFVP3526YQC

Nest Xilem tuples longer than 10 elements

Unfortunately Rust lacks variadic generics, so Xilem tuples cannot be longer than 10 children. This is solved by recursively breaking up a tuple into chunks of 10, until there is no tuple with a size greater than 10. This will be a lot less necessary once a string merging pass is added (merge consecutive strings into each other).

Created by finchie on October 31, 2023

RAWT2FQSTIP6EWFQXMAESASEM6AIFCV4PDO6TRUN6EAFVP3526YQC

Dependencies

In channels

main

Change contents

Insertion in crates/typst_rust_gen/src/lib.rs at line 9 [4.1210]
[2.1162]
[4.1232]
```
const MAX_TUPLE_LEN: usize = 10;
```
Deletion in crates/typst_rust_gen/src/lib.rs at line 59 [4.1210]
B:BD[5.1261] → [5.1261:1381]
∅:D[5.1381] → [4.1308:1309]
B:BD[4.1308] → [4.1308:1309]
```
        let mut args: Punctuated<syn::Expr, syn::token::Comma> = Punctuated::new();
        args.push(self.expression);
```

Replacement in crates/typst_rust_gen/src/lib.rs at line 63 [4.1210]

B:BD[5.1558] → [5.1558:1576]

            args,

[5.1558]

[5.1576]

            args: Punctuated::from_iter([self.expression].into_iter()),

Insertion in crates/typst_rust_gen/src/lib.rs at line 369 [4.1210]
[3.280]
[4.2470]
```
    dbg!(inline);
```

Replacement in crates/typst_rust_gen/src/lib.rs at line 372 [4.1210]

B:BD[3.369] → [3.369:443]

        pandoc_ast::Inline::Space => syn::Expr::Lit(literal_string(" ")),

[3.369]

[4.2579]

        pandoc_ast::Inline::Space | pandoc_ast::Inline::SoftBreak => {
            syn::Expr::Lit(literal_string(" "))
        }

Insertion in crates/typst_rust_gen/src/lib.rs at line 376 [4.1210]

[4.2601]

    }
}
// Xilem only supports tuples of max length 10, so split up inlines into nested tuples until it fits
fn split_tuple(expressions: Vec<syn::Expr>) -> Vec<syn::Expr> {
    if expressions.len() <= MAX_TUPLE_LEN {
        return expressions;
    }
    let mut elements: Vec<syn::Expr> = Vec::new();
    for expression_chunk in expressions.chunks(MAX_TUPLE_LEN) {
        let expression_group: Vec<syn::Expr> = expression_chunk.to_vec();
        elements.push(syn::Expr::Tuple(syn::ExprTuple {
            attrs: Vec::new(),
            paren_token: syn::token::Paren::default(),
            elems: Punctuated::from_iter(expression_group.into_iter()),
        }))
    }
    // May need to recursively nest inside tuples
    if elements.len() > MAX_TUPLE_LEN {
        elements = split_tuple(elements);

Insertion in crates/typst_rust_gen/src/lib.rs at line 400 [4.1210]
[4.2607]
[4.2607]
```
    elements
```

Replacement in crates/typst_rust_gen/src/lib.rs at line 404 [4.1210]

B:BD[5.4565] → [3.444:509]

    let expressions = inlines.into_iter().map(transform_inline);

[5.4565]

[5.4699]

    let expressions = inlines
        .into_iter()
        .map(transform_inline)
        .collect::<Vec<_>>();

Replacement in crates/typst_rust_gen/src/lib.rs at line 410 [4.1210]

B:BD[3.567] → [3.567:605]

∅:D[3.605] → [5.4899:4926]

B:BD[5.4899] → [5.4899:4926]

B:BD[5.4926] → [3.606:708]

∅:D[3.708] → [5.4963:4970]

B:BD[5.4963] → [5.4963:4970]

    syn::Expr::Tuple(syn::ExprTuple {
        attrs: Vec::new(),
        paren_token: syn::token::Paren::default(),
        elems: Punctuated::from_iter(expressions),
    })

[3.567]

[4.2784]

    let tuples = split_tuple(expressions);
    match &tuples[..] {
        [single] => single.to_owned(),
        _ => syn::Expr::Tuple(syn::ExprTuple {
            attrs: Vec::new(),
            paren_token: syn::token::Paren::default(),
            elems: Punctuated::from_iter(tuples.into_iter()),
        }),
    }

Nest Xilem tuples longer than 10 elements

Dependencies

In channels

Change contents

Insertion in crates/typst_rust_gen/src/lib.rs at line 9 [4.1210]

Deletion in crates/typst_rust_gen/src/lib.rs at line 59 [4.1210]

Replacement in crates/typst_rust_gen/src/lib.rs at line 63 [4.1210]

Insertion in crates/typst_rust_gen/src/lib.rs at line 369 [4.1210]

Replacement in crates/typst_rust_gen/src/lib.rs at line 372 [4.1210]

Insertion in crates/typst_rust_gen/src/lib.rs at line 376 [4.1210]

Insertion in crates/typst_rust_gen/src/lib.rs at line 400 [4.1210]

Replacement in crates/typst_rust_gen/src/lib.rs at line 404 [4.1210]

Replacement in crates/typst_rust_gen/src/lib.rs at line 410 [4.1210]