Sort lifetimes by longest first

crates/math-core/src/lib.rs

@@ -307,7 +307,7 @@ fn convert(
     Ok(output)
 }
 
-fn parse<'arena, 'source, 'config>(
+fn parse<'config, 'source, 'arena>(
     latex: &'source str,
     arena: &'arena Arena,
     cmd_cfg: Option<&'config CommandConfig>,

crates/math-core/src/parser.rs

@@ -23,16 +23,16 @@ use crate::{
     token_queue::{MacroArgument, OneOrNone, TokenQueue},
 };
 
-pub(crate) struct Parser<'arena, 'source, 'config> {
-    pub(super) tokens: TokenQueue<'source, 'config>,
+pub(crate) struct Parser<'config, 'source, 'arena> {
+    pub(super) tokens: TokenQueue<'config, 'source>,
     pub(super) buffer: Buffer,
     pub(super) arena: &'arena Arena,
     equation_counter: &'arena mut u16,
     label_map: &'arena mut FxHashMap<Box<str>, NonZeroU16>,
-    state: ParserState<'arena, 'source>,
+    state: ParserState<'source, 'arena>,
 }
 
-struct ParserState<'arena, 'source> {
+struct ParserState<'source, 'arena> {
     cmd_args: Vec<TokSpan<'source>>,
     cmd_arg_offsets: [usize; 9],
     transform: Option<MathVariant>,
@@ -91,7 +91,7 @@ impl ParseAs {
 
 pub(super) type ParseResult<T> = Result<T, Box<LatexError>>;
 
-impl<'arena, 'source, 'config> Parser<'arena, 'source, 'config>
+impl<'config, 'source, 'arena> Parser<'config, 'source, 'arena>
 where
     'config: 'source, // The config will live as long as the source.
     'source: 'arena,
@@ -603,13 +603,12 @@ where
                 }
             }
             Token::Genfrac => 'genfrac: {
-                fn get_delimiter<'cell, 'arena, 'source, 'config>(
-                    parser: &mut Parser<'arena, 'source, 'config>,
+                fn get_delimiter<'config, 'source, 'arena>(
+                    parser: &mut Parser<'config, 'source, 'arena>,
                 ) -> Result<Option<StretchableOp>, Box<LatexError>>
                 where
                     'config: 'source,
                     'source: 'arena,
-                    'arena: 'cell,
                 {
                     let tok = parser.tokens.read_argument(false)?.into_one_or_none()?;
                     Ok(match tok {

crates/math-core/src/text_parser.rs

@@ -12,7 +12,7 @@ use crate::{
     token::{EndToken, Mode, TextToken, Token},
 };
 
-impl<'arena> Parser<'arena, '_, '_> {
+impl<'arena> Parser<'_, '_, 'arena> {
     pub(super) fn extract_text(
         &mut self,
         initial_style: Option<HtmlTextStyle>,

crates/math-core/src/token_queue.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 
 /// A token queue that allows peeking at the next non-whitespace token.
-pub(super) struct TokenQueue<'source, 'config> {
+pub(super) struct TokenQueue<'config, 'source> {
     pub lexer: Lexer<'config, 'source>,
     queue: VecDeque<TokSpan<'source>>,
     lexer_is_eoi: bool,
@@ -17,7 +17,7 @@ pub(super) struct TokenQueue<'source, 'config> {
 
 static EOI_TOK: TokSpan = TokSpan::new(Token::Eoi, Span::zero_width(0));
 
-impl<'source, 'config> TokenQueue<'source, 'config> {
+impl<'config, 'source> TokenQueue<'config, 'source> {
     pub(super) fn new(lexer: Lexer<'config, 'source>) -> Result<Self, Box<LatexError>> {
         let mut tm = TokenQueue {
             lexer,