diff --git a/Cargo.toml b/Cargo.toml
index 7a5c1bda0..d6f24910d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,17 +24,17 @@ serde = { version = "^1.0", features = ["derive"] }
 termcolor = "^1.2"
 walkdir = "^2.3"
 
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
 tree-sitter-java = "=0.23.5"
 tree-sitter-kotlin-ng = "1.1.0"
 tree-sitter-typescript = "=0.23.2"
 tree-sitter-javascript = "=0.23.1"
 tree-sitter-python = "=0.23.6"
-tree-sitter-rust = "=0.23.2"
-tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.3" }
-tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.3" }
-tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.4" }
-tree-sitter-mozjs = { path = "./tree-sitter-mozjs", version = "=0.20.3" }
+tree-sitter-rust = "=0.24.0"
+tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.4" }
+tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.4" }
+tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.5" }
+tree-sitter-mozjs = { path = "./tree-sitter-mozjs", version = "=0.20.4" }
 
 [dev-dependencies]
 insta = { version = "1.29.0", features = ["yaml", "json", "redactions"] }
diff --git a/enums/Cargo.toml b/enums/Cargo.toml
index d2dcc438e..9163c62ea 100644
--- a/enums/Cargo.toml
+++ b/enums/Cargo.toml
@@ -8,17 +8,17 @@ edition = "2024"
 clap = { version = "^4.0", features = ["derive"] }
 askama = "^0.14"
 
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
 tree-sitter-java = "=0.23.5"
 tree-sitter-kotlin-ng = "1.1.0"
 tree-sitter-typescript = "=0.23.2"
 tree-sitter-javascript = "=0.23.1"
 tree-sitter-python = "=0.23.6"
-tree-sitter-rust = "=0.23.2"
-tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.20.3" }
-tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "=0.20.3" }
-tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.4" }
-tree-sitter-mozjs = { path = "../tree-sitter-mozjs", version = "=0.20.3" }
+tree-sitter-rust = "=0.24.0"
+tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.20.4" }
+tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "=0.20.4" }
+tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.5" }
+tree-sitter-mozjs = { path = "../tree-sitter-mozjs", version = "=0.20.4" }
 
 [profile.release]
 strip = "debuginfo"
diff --git a/src/languages/language_rust.rs b/src/languages/language_rust.rs
index e9b9f8e9a..456b49b2e 100644
--- a/src/languages/language_rust.rs
+++ b/src/languages/language_rust.rs
@@ -23,338 +23,343 @@ pub enum Rust {
     QMARK = 16,
     Block2 = 17,
     Expr = 18,
-    Ident = 19,
-    Item = 20,
-    Lifetime2 = 21,
-    Literal = 22,
-    Meta = 23,
-    Pat = 24,
-    Path = 25,
-    Stmt = 26,
-    Tt = 27,
-    Ty = 28,
-    Vis = 29,
-    PrimitiveType = 30,
-    PrimitiveType2 = 31,
-    PrimitiveType3 = 32,
-    PrimitiveType4 = 33,
-    PrimitiveType5 = 34,
-    PrimitiveType6 = 35,
-    PrimitiveType7 = 36,
-    PrimitiveType8 = 37,
-    PrimitiveType9 = 38,
-    PrimitiveType10 = 39,
-    PrimitiveType11 = 40,
-    PrimitiveType12 = 41,
-    PrimitiveType13 = 42,
-    PrimitiveType14 = 43,
-    PrimitiveType15 = 44,
-    PrimitiveType16 = 45,
-    PrimitiveType17 = 46,
-    DASH = 47,
-    SLASH = 48,
-    PERCENT = 49,
-    CARET = 50,
-    BANG = 51,
-    AMP = 52,
-    PIPE = 53,
-    AMPAMP = 54,
-    PIPEPIPE = 55,
-    LTLT = 56,
-    GTGT = 57,
-    PLUSEQ = 58,
-    DASHEQ = 59,
-    STAREQ = 60,
-    SLASHEQ = 61,
-    PERCENTEQ = 62,
-    CARETEQ = 63,
-    AMPEQ = 64,
-    PIPEEQ = 65,
-    LTLTEQ = 66,
-    GTGTEQ = 67,
-    EQ = 68,
-    EQEQ = 69,
-    BANGEQ = 70,
-    GT = 71,
-    LT = 72,
-    GTEQ = 73,
-    LTEQ = 74,
-    AT = 75,
-    UNDERSCORE = 76,
-    DOT = 77,
-    DOTDOT = 78,
-    DOTDOTDOT = 79,
-    DOTDOTEQ = 80,
-    COMMA = 81,
-    COLONCOLON = 82,
-    DASHGT = 83,
-    HASH = 84,
-    SQUOTE = 85,
-    As = 86,
-    Async = 87,
-    Await = 88,
-    Break = 89,
-    Const = 90,
-    Continue = 91,
-    Default = 92,
-    Enum = 93,
-    Fn = 94,
-    For = 95,
-    Gen = 96,
-    If = 97,
-    Impl = 98,
-    Let = 99,
-    Loop = 100,
-    Match = 101,
-    Mod = 102,
-    Pub = 103,
-    Return = 104,
-    Static = 105,
-    Struct = 106,
-    Trait = 107,
-    Type = 108,
-    Union = 109,
-    Unsafe = 110,
-    Use = 111,
-    Where = 112,
-    While = 113,
-    Extern = 114,
-    Ref = 115,
-    Else = 116,
-    In = 117,
-    LT2 = 118,
-    Dyn = 119,
-    MutableSpecifier = 120,
-    Raw = 121,
-    Yield = 122,
-    Move = 123,
-    Try = 124,
-    IntegerLiteral = 125,
-    DQUOTE = 126,
-    DQUOTE2 = 127,
-    CharLiteral = 128,
-    EscapeSequence = 129,
-    True = 130,
-    False = 131,
-    SLASHSLASH = 132,
-    LineCommentToken1 = 133,
-    LineCommentToken2 = 134,
-    LineCommentToken3 = 135,
-    BANG2 = 136,
-    SLASH2 = 137,
-    SLASHSTAR = 138,
-    STARSLASH = 139,
-    Shebang = 140,
-    Zelf = 141,
-    Super = 142,
-    Crate = 143,
-    Metavariable = 144,
-    StringContent = 145,
-    RawStringLiteralStart = 146,
-    StringContent2 = 147,
-    RawStringLiteralEnd = 148,
-    FloatLiteral = 149,
-    OuterDocCommentMarker = 150,
-    InnerDocCommentMarker = 151,
-    BlockCommentContent = 152,
-    DocComment = 153,
-    ErrorSentinel = 154,
-    SourceFile = 155,
-    Statement = 156,
-    EmptyStatement = 157,
-    ExpressionStatement = 158,
-    MacroDefinition = 159,
-    MacroRule = 160,
-    TokenPattern = 161,
-    TokenTreePattern = 162,
-    TokenBindingPattern = 163,
-    TokenRepetitionPattern = 164,
-    FragmentSpecifier = 165,
-    TokenTree = 166,
-    TokenRepetition = 167,
-    AttributeItem = 168,
-    InnerAttributeItem = 169,
-    Attribute = 170,
-    ModItem = 171,
-    ForeignModItem = 172,
-    DeclarationList = 173,
-    StructItem = 174,
-    UnionItem = 175,
-    EnumItem = 176,
-    EnumVariantList = 177,
-    EnumVariant = 178,
-    FieldDeclarationList = 179,
-    FieldDeclaration = 180,
-    OrderedFieldDeclarationList = 181,
-    ExternCrateDeclaration = 182,
-    ConstItem = 183,
-    StaticItem = 184,
-    TypeItem = 185,
-    FunctionItem = 186,
-    FunctionSignatureItem = 187,
-    FunctionModifiers = 188,
-    WhereClause = 189,
-    WherePredicate = 190,
-    ImplItem = 191,
-    TraitItem = 192,
-    AssociatedType = 193,
-    TraitBounds = 194,
-    HigherRankedTraitBound = 195,
-    RemovedTraitBound = 196,
-    TypeParameters = 197,
-    ConstParameter = 198,
-    ConstrainedTypeParameter = 199,
-    OptionalTypeParameter = 200,
-    LetDeclaration = 201,
-    UseDeclaration = 202,
-    UseClause = 203,
-    ScopedUseList = 204,
-    UseList = 205,
-    UseAsClause = 206,
-    UseWildcard = 207,
-    Parameters = 208,
-    SelfParameter = 209,
-    VariadicParameter = 210,
-    Parameter = 211,
-    ExternModifier = 212,
-    VisibilityModifier = 213,
-    Type2 = 214,
-    BracketedType = 215,
-    QualifiedType = 216,
-    Lifetime = 217,
-    ArrayType = 218,
-    ForLifetimes = 219,
-    FunctionType = 220,
-    TupleType = 221,
-    UnitType = 222,
-    GenericFunction = 223,
-    GenericType = 224,
-    GenericTypeWithTurbofish = 225,
-    BoundedType = 226,
-    TypeArguments = 227,
-    TypeBinding = 228,
-    ReferenceType = 229,
-    PointerType = 230,
-    NeverType = 231,
-    AbstractType = 232,
-    DynamicType = 233,
-    ExpressionExceptRange = 234,
-    Expression = 235,
-    MacroInvocation = 236,
-    TokenTree2 = 237,
-    DelimTokens = 238,
-    NonDelimToken = 239,
-    ScopedIdentifier = 240,
-    ScopedTypeIdentifier = 241,
-    ScopedTypeIdentifier2 = 242,
-    RangeExpression = 243,
-    UnaryExpression = 244,
-    TryExpression = 245,
-    ReferenceExpression = 246,
-    BinaryExpression = 247,
-    AssignmentExpression = 248,
-    CompoundAssignmentExpr = 249,
-    TypeCastExpression = 250,
-    ReturnExpression = 251,
-    YieldExpression = 252,
-    CallExpression = 253,
-    Arguments = 254,
-    ArrayExpression = 255,
-    ParenthesizedExpression = 256,
-    TupleExpression = 257,
-    UnitExpression = 258,
-    StructExpression = 259,
-    FieldInitializerList = 260,
-    ShorthandFieldInitializer = 261,
-    FieldInitializer = 262,
-    BaseFieldInitializer = 263,
-    IfExpression = 264,
-    LetCondition = 265,
-    LetChain2 = 266,
-    Condition = 267,
-    ElseClause = 268,
-    MatchExpression = 269,
-    MatchBlock = 270,
-    MatchArm = 271,
-    MatchArm2 = 272,
-    MatchPattern = 273,
-    WhileExpression = 274,
-    LoopExpression = 275,
-    ForExpression = 276,
-    ConstBlock = 277,
-    ClosureExpression = 278,
-    ClosureParameters = 279,
-    Label = 280,
-    BreakExpression = 281,
-    ContinueExpression = 282,
-    IndexExpression = 283,
-    AwaitExpression = 284,
-    FieldExpression = 285,
-    UnsafeBlock = 286,
-    AsyncBlock = 287,
-    GenBlock = 288,
-    TryBlock = 289,
-    Block = 290,
-    Pattern = 291,
-    TuplePattern = 292,
-    SlicePattern = 293,
-    TupleStructPattern = 294,
-    StructPattern = 295,
-    FieldPattern = 296,
-    RemainingFieldPattern = 297,
-    MutPattern = 298,
-    RangePattern = 299,
-    RefPattern = 300,
-    CapturedPattern = 301,
-    ReferencePattern = 302,
-    OrPattern = 303,
-    Literal2 = 304,
-    LiteralPattern = 305,
-    NegativeLiteral = 306,
-    StringLiteral = 307,
-    RawStringLiteral = 308,
-    BooleanLiteral = 309,
-    LineComment = 310,
-    LineDocCommentMarker = 311,
-    InnerDocCommentMarker2 = 312,
-    OuterDocCommentMarker2 = 313,
-    BlockComment = 314,
-    BlockDocCommentMarker = 315,
-    SourceFileRepeat1 = 316,
-    MacroDefinitionRepeat1 = 317,
-    TokenTreePatternRepeat1 = 318,
-    TokenTreeRepeat1 = 319,
-    NonSpecialTokenRepeat1 = 320,
-    DeclarationListRepeat1 = 321,
-    EnumVariantListRepeat1 = 322,
-    EnumVariantListRepeat2 = 323,
-    FieldDeclarationListRepeat1 = 324,
-    OrderedFieldDeclarationListRepeat1 = 325,
-    FunctionModifiersRepeat1 = 326,
-    WhereClauseRepeat1 = 327,
-    TraitBoundsRepeat1 = 328,
-    TypeParametersRepeat1 = 329,
-    UseListRepeat1 = 330,
-    ParametersRepeat1 = 331,
-    ForLifetimesRepeat1 = 332,
-    TupleTypeRepeat1 = 333,
-    TypeArgumentsRepeat1 = 334,
-    DelimTokenTreeRepeat1 = 335,
-    ArgumentsRepeat1 = 336,
-    TupleExpressionRepeat1 = 337,
-    FieldInitializerListRepeat1 = 338,
-    MatchBlockRepeat1 = 339,
-    MatchArmRepeat1 = 340,
-    ClosureParametersRepeat1 = 341,
-    TuplePatternRepeat1 = 342,
-    SlicePatternRepeat1 = 343,
-    StructPatternRepeat1 = 344,
-    StringLiteralRepeat1 = 345,
-    FieldIdentifier = 346,
-    LetChain = 347,
-    ShorthandFieldIdentifier = 348,
-    TypeIdentifier = 349,
-    Error = 350,
+    Expr2021 = 19,
+    Ident = 20,
+    Item = 21,
+    Lifetime2 = 22,
+    Literal = 23,
+    Meta = 24,
+    Pat = 25,
+    PatParam = 26,
+    Path = 27,
+    Stmt = 28,
+    Tt = 29,
+    Ty = 30,
+    Vis = 31,
+    PrimitiveType = 32,
+    PrimitiveType2 = 33,
+    PrimitiveType3 = 34,
+    PrimitiveType4 = 35,
+    PrimitiveType5 = 36,
+    PrimitiveType6 = 37,
+    PrimitiveType7 = 38,
+    PrimitiveType8 = 39,
+    PrimitiveType9 = 40,
+    PrimitiveType10 = 41,
+    PrimitiveType11 = 42,
+    PrimitiveType12 = 43,
+    PrimitiveType13 = 44,
+    PrimitiveType14 = 45,
+    PrimitiveType15 = 46,
+    PrimitiveType16 = 47,
+    PrimitiveType17 = 48,
+    DASH = 49,
+    SLASH = 50,
+    PERCENT = 51,
+    CARET = 52,
+    BANG = 53,
+    AMP = 54,
+    PIPE = 55,
+    AMPAMP = 56,
+    PIPEPIPE = 57,
+    LTLT = 58,
+    GTGT = 59,
+    PLUSEQ = 60,
+    DASHEQ = 61,
+    STAREQ = 62,
+    SLASHEQ = 63,
+    PERCENTEQ = 64,
+    CARETEQ = 65,
+    AMPEQ = 66,
+    PIPEEQ = 67,
+    LTLTEQ = 68,
+    GTGTEQ = 69,
+    EQ = 70,
+    EQEQ = 71,
+    BANGEQ = 72,
+    GT = 73,
+    LT = 74,
+    GTEQ = 75,
+    LTEQ = 76,
+    AT = 77,
+    UNDERSCORE = 78,
+    DOT = 79,
+    DOTDOT = 80,
+    DOTDOTDOT = 81,
+    DOTDOTEQ = 82,
+    COMMA = 83,
+    COLONCOLON = 84,
+    DASHGT = 85,
+    HASH = 86,
+    SQUOTE = 87,
+    As = 88,
+    Async = 89,
+    Await = 90,
+    Break = 91,
+    Const = 92,
+    Continue = 93,
+    Default = 94,
+    Enum = 95,
+    Fn = 96,
+    For = 97,
+    Gen = 98,
+    If = 99,
+    Impl = 100,
+    Let = 101,
+    Loop = 102,
+    Match = 103,
+    Mod = 104,
+    Pub = 105,
+    Return = 106,
+    Static = 107,
+    Struct = 108,
+    Trait = 109,
+    Type = 110,
+    Union = 111,
+    Unsafe = 112,
+    Use = 113,
+    Where = 114,
+    While = 115,
+    Extern = 116,
+    Ref = 117,
+    Else = 118,
+    In = 119,
+    LT2 = 120,
+    Dyn = 121,
+    MutableSpecifier = 122,
+    Raw = 123,
+    Yield = 124,
+    Move = 125,
+    Try = 126,
+    IntegerLiteral = 127,
+    DQUOTE = 128,
+    DQUOTE2 = 129,
+    CharLiteral = 130,
+    EscapeSequence = 131,
+    True = 132,
+    False = 133,
+    SLASHSLASH = 134,
+    LineCommentToken1 = 135,
+    LineCommentToken2 = 136,
+    LineCommentToken3 = 137,
+    BANG2 = 138,
+    SLASH2 = 139,
+    SLASHSTAR = 140,
+    STARSLASH = 141,
+    Shebang = 142,
+    Zelf = 143,
+    Super = 144,
+    Crate = 145,
+    Metavariable = 146,
+    StringContent = 147,
+    RawStringLiteralStart = 148,
+    StringContent2 = 149,
+    RawStringLiteralEnd = 150,
+    FloatLiteral = 151,
+    OuterDocCommentMarker = 152,
+    InnerDocCommentMarker = 153,
+    BlockCommentContent = 154,
+    DocComment = 155,
+    ErrorSentinel = 156,
+    SourceFile = 157,
+    Statement = 158,
+    EmptyStatement = 159,
+    ExpressionStatement = 160,
+    MacroDefinition = 161,
+    MacroRule = 162,
+    TokenPattern = 163,
+    TokenTreePattern = 164,
+    TokenBindingPattern = 165,
+    TokenRepetitionPattern = 166,
+    FragmentSpecifier = 167,
+    TokenTree = 168,
+    TokenRepetition = 169,
+    AttributeItem = 170,
+    InnerAttributeItem = 171,
+    Attribute = 172,
+    ModItem = 173,
+    ForeignModItem = 174,
+    DeclarationList = 175,
+    StructItem = 176,
+    UnionItem = 177,
+    EnumItem = 178,
+    EnumVariantList = 179,
+    EnumVariant = 180,
+    FieldDeclarationList = 181,
+    FieldDeclaration = 182,
+    OrderedFieldDeclarationList = 183,
+    ExternCrateDeclaration = 184,
+    ConstItem = 185,
+    StaticItem = 186,
+    TypeItem = 187,
+    FunctionItem = 188,
+    FunctionSignatureItem = 189,
+    FunctionModifiers = 190,
+    WhereClause = 191,
+    WherePredicate = 192,
+    ImplItem = 193,
+    TraitItem = 194,
+    AssociatedType = 195,
+    TraitBounds = 196,
+    HigherRankedTraitBound = 197,
+    RemovedTraitBound = 198,
+    TypeParameters = 199,
+    ConstParameter = 200,
+    TypeParameter = 201,
+    LifetimeParameter = 202,
+    LetDeclaration = 203,
+    UseDeclaration = 204,
+    UseClause = 205,
+    ScopedUseList = 206,
+    UseList = 207,
+    UseAsClause = 208,
+    UseWildcard = 209,
+    Parameters = 210,
+    SelfParameter = 211,
+    VariadicParameter = 212,
+    Parameter = 213,
+    ExternModifier = 214,
+    VisibilityModifier = 215,
+    Type2 = 216,
+    BracketedType = 217,
+    QualifiedType = 218,
+    Lifetime = 219,
+    ArrayType = 220,
+    ForLifetimes = 221,
+    FunctionType = 222,
+    TupleType = 223,
+    UnitType = 224,
+    GenericFunction = 225,
+    GenericType = 226,
+    GenericTypeWithTurbofish = 227,
+    BoundedType = 228,
+    UseBounds = 229,
+    TypeArguments = 230,
+    TypeBinding = 231,
+    ReferenceType = 232,
+    PointerType = 233,
+    NeverType = 234,
+    AbstractType = 235,
+    DynamicType = 236,
+    ExpressionExceptRange = 237,
+    Expression = 238,
+    MacroInvocation = 239,
+    TokenTree2 = 240,
+    DelimTokens = 241,
+    NonDelimToken = 242,
+    ScopedIdentifier = 243,
+    ScopedTypeIdentifier = 244,
+    ScopedTypeIdentifier2 = 245,
+    RangeExpression = 246,
+    UnaryExpression = 247,
+    TryExpression = 248,
+    ReferenceExpression = 249,
+    BinaryExpression = 250,
+    AssignmentExpression = 251,
+    CompoundAssignmentExpr = 252,
+    TypeCastExpression = 253,
+    ReturnExpression = 254,
+    YieldExpression = 255,
+    CallExpression = 256,
+    Arguments = 257,
+    ArrayExpression = 258,
+    ParenthesizedExpression = 259,
+    TupleExpression = 260,
+    UnitExpression = 261,
+    StructExpression = 262,
+    FieldInitializerList = 263,
+    ShorthandFieldInitializer = 264,
+    FieldInitializer = 265,
+    BaseFieldInitializer = 266,
+    IfExpression = 267,
+    LetCondition = 268,
+    LetChain2 = 269,
+    Condition = 270,
+    ElseClause = 271,
+    MatchExpression = 272,
+    MatchBlock = 273,
+    MatchArm = 274,
+    MatchArm2 = 275,
+    MatchPattern = 276,
+    WhileExpression = 277,
+    LoopExpression = 278,
+    ForExpression = 279,
+    ConstBlock = 280,
+    ClosureExpression = 281,
+    ClosureParameters = 282,
+    Label = 283,
+    BreakExpression = 284,
+    ContinueExpression = 285,
+    IndexExpression = 286,
+    AwaitExpression = 287,
+    FieldExpression = 288,
+    UnsafeBlock = 289,
+    AsyncBlock = 290,
+    GenBlock = 291,
+    TryBlock = 292,
+    Block = 293,
+    Pattern = 294,
+    GenericPattern = 295,
+    TuplePattern = 296,
+    SlicePattern = 297,
+    TupleStructPattern = 298,
+    StructPattern = 299,
+    FieldPattern = 300,
+    RemainingFieldPattern = 301,
+    MutPattern = 302,
+    RangePattern = 303,
+    RefPattern = 304,
+    CapturedPattern = 305,
+    ReferencePattern = 306,
+    OrPattern = 307,
+    Literal2 = 308,
+    LiteralPattern = 309,
+    NegativeLiteral = 310,
+    StringLiteral = 311,
+    RawStringLiteral = 312,
+    BooleanLiteral = 313,
+    LineComment = 314,
+    LineDocCommentMarker = 315,
+    InnerDocCommentMarker2 = 316,
+    OuterDocCommentMarker2 = 317,
+    BlockComment = 318,
+    BlockDocCommentMarker = 319,
+    SourceFileRepeat1 = 320,
+    MacroDefinitionRepeat1 = 321,
+    TokenTreePatternRepeat1 = 322,
+    TokenTreeRepeat1 = 323,
+    NonSpecialTokenRepeat1 = 324,
+    DeclarationListRepeat1 = 325,
+    EnumVariantListRepeat1 = 326,
+    EnumVariantListRepeat2 = 327,
+    FieldDeclarationListRepeat1 = 328,
+    OrderedFieldDeclarationListRepeat1 = 329,
+    FunctionModifiersRepeat1 = 330,
+    WhereClauseRepeat1 = 331,
+    TraitBoundsRepeat1 = 332,
+    TypeParametersRepeat1 = 333,
+    UseListRepeat1 = 334,
+    ParametersRepeat1 = 335,
+    ForLifetimesRepeat1 = 336,
+    TupleTypeRepeat1 = 337,
+    UseBoundsRepeat1 = 338,
+    TypeArgumentsRepeat1 = 339,
+    DelimTokenTreeRepeat1 = 340,
+    ArgumentsRepeat1 = 341,
+    TupleExpressionRepeat1 = 342,
+    FieldInitializerListRepeat1 = 343,
+    MatchBlockRepeat1 = 344,
+    MatchArmRepeat1 = 345,
+    ClosureParametersRepeat1 = 346,
+    TuplePatternRepeat1 = 347,
+    SlicePatternRepeat1 = 348,
+    StructPatternRepeat1 = 349,
+    StringLiteralRepeat1 = 350,
+    FieldIdentifier = 351,
+    LetChain = 352,
+    ShorthandFieldIdentifier = 353,
+    TypeIdentifier = 354,
+    Error = 355,
 }
 
 impl From<Rust> for &'static str {
@@ -380,12 +385,14 @@ impl From<Rust> for &'static str {
             Rust::QMARK => "?",
             Rust::Block2 => "block",
             Rust::Expr => "expr",
+            Rust::Expr2021 => "expr_2021",
             Rust::Ident => "ident",
             Rust::Item => "item",
             Rust::Lifetime2 => "lifetime",
             Rust::Literal => "literal",
             Rust::Meta => "meta",
             Rust::Pat => "pat",
+            Rust::PatParam => "pat_param",
             Rust::Path => "path",
             Rust::Stmt => "stmt",
             Rust::Tt => "tt",
@@ -560,8 +567,8 @@ impl From<Rust> for &'static str {
             Rust::RemovedTraitBound => "removed_trait_bound",
             Rust::TypeParameters => "type_parameters",
             Rust::ConstParameter => "const_parameter",
-            Rust::ConstrainedTypeParameter => "constrained_type_parameter",
-            Rust::OptionalTypeParameter => "optional_type_parameter",
+            Rust::TypeParameter => "type_parameter",
+            Rust::LifetimeParameter => "lifetime_parameter",
             Rust::LetDeclaration => "let_declaration",
             Rust::UseDeclaration => "use_declaration",
             Rust::UseClause => "_use_clause",
@@ -588,6 +595,7 @@ impl From<Rust> for &'static str {
             Rust::GenericType => "generic_type",
             Rust::GenericTypeWithTurbofish => "generic_type_with_turbofish",
             Rust::BoundedType => "bounded_type",
+            Rust::UseBounds => "use_bounds",
             Rust::TypeArguments => "type_arguments",
             Rust::TypeBinding => "type_binding",
             Rust::ReferenceType => "reference_type",
@@ -653,6 +661,7 @@ impl From<Rust> for &'static str {
             Rust::TryBlock => "try_block",
             Rust::Block => "block",
             Rust::Pattern => "_pattern",
+            Rust::GenericPattern => "generic_pattern",
             Rust::TuplePattern => "tuple_pattern",
             Rust::SlicePattern => "slice_pattern",
             Rust::TupleStructPattern => "tuple_struct_pattern",
@@ -695,6 +704,7 @@ impl From<Rust> for &'static str {
             Rust::ParametersRepeat1 => "parameters_repeat1",
             Rust::ForLifetimesRepeat1 => "for_lifetimes_repeat1",
             Rust::TupleTypeRepeat1 => "tuple_type_repeat1",
+            Rust::UseBoundsRepeat1 => "use_bounds_repeat1",
             Rust::TypeArgumentsRepeat1 => "type_arguments_repeat1",
             Rust::DelimTokenTreeRepeat1 => "delim_token_tree_repeat1",
             Rust::ArgumentsRepeat1 => "arguments_repeat1",
diff --git a/tree-sitter-ccomment/Cargo.toml b/tree-sitter-ccomment/Cargo.toml
index d9df06f4e..70e4ee5ca 100644
--- a/tree-sitter-ccomment/Cargo.toml
+++ b/tree-sitter-ccomment/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-ccomment"
 description = "Ccomment grammar for the tree-sitter parsing library"
-version = "0.20.3"
+version = "0.20.4"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
@@ -27,4 +27,4 @@ tree-sitter-language="0.1.0"
 cc = "^1.0"
 
 [dev-dependencies]
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
diff --git a/tree-sitter-ccomment/bindings/rust/README.md b/tree-sitter-ccomment/bindings/rust/README.md
index 854adc4a2..c000c985c 100644
--- a/tree-sitter-ccomment/bindings/rust/README.md
+++ b/tree-sitter-ccomment/bindings/rust/README.md
@@ -8,7 +8,7 @@ way.)
 
 ``` toml
 [dependencies]
-tree-sitter = "0.25.3"
+tree-sitter = "0.25.4"
 tree-sitter-ccomment = "0.20.3"
 ```
 
diff --git a/tree-sitter-ccomment/package.json b/tree-sitter-ccomment/package.json
index 6b89cd065..e9f17f7ed 100644
--- a/tree-sitter-ccomment/package.json
+++ b/tree-sitter-ccomment/package.json
@@ -13,7 +13,7 @@
     "nan": "^2.14.2"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.25.3"
+    "tree-sitter-cli": "^0.25.4"
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
diff --git a/tree-sitter-ccomment/src/parser.c b/tree-sitter-ccomment/src/parser.c
index 69011d1f5..c8b2f5f6c 100644
--- a/tree-sitter-ccomment/src/parser.c
+++ b/tree-sitter-ccomment/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically generated by tree-sitter v0.25.3 (2a835ee029dca1c325e6f1c01dbce40396f6123e) */
+/* Automatically @generated by tree-sitter v0.25.4 (726dcd1e872149d95de581589fc408fb8ea9cb0b) */
 
 #include "tree_sitter/parser.h"
 
diff --git a/tree-sitter-ccomment/src/tree_sitter/parser.h b/tree-sitter-ccomment/src/tree_sitter/parser.h
index cdbe64ccc..858107deb 100644
--- a/tree-sitter-ccomment/src/tree_sitter/parser.h
+++ b/tree-sitter-ccomment/src/tree_sitter/parser.h
@@ -18,7 +18,6 @@ typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
-typedef struct TSLanguageMetadata TSLanguageMetadata;
 typedef struct TSLanguageMetadata {
   uint8_t major_version;
   uint8_t minor_version;
diff --git a/tree-sitter-mozcpp/Cargo.toml b/tree-sitter-mozcpp/Cargo.toml
index 7924acb47..cb350705a 100644
--- a/tree-sitter-mozcpp/Cargo.toml
+++ b/tree-sitter-mozcpp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-mozcpp"
 description = "Mozcpp grammar for the tree-sitter parsing library"
-version = "0.20.4"
+version = "0.20.5"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
@@ -33,4 +33,4 @@ tree-sitter-cpp = "0.23.4"
 build = ["tree-sitter-cpp"]
 
 [dev-dependencies]
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
diff --git a/tree-sitter-mozcpp/bindings/rust/README.md b/tree-sitter-mozcpp/bindings/rust/README.md
index 307be1f42..3cae1bb6a 100644
--- a/tree-sitter-mozcpp/bindings/rust/README.md
+++ b/tree-sitter-mozcpp/bindings/rust/README.md
@@ -8,7 +8,7 @@ way.)
 
 ``` toml
 [dependencies]
-tree-sitter = "0.25.3"
+tree-sitter = "0.25.4"
 tree-sitter-mozcpp = "0.20.4"
 ```
 
diff --git a/tree-sitter-mozcpp/package.json b/tree-sitter-mozcpp/package.json
index 26a6e5d56..258e35354 100644
--- a/tree-sitter-mozcpp/package.json
+++ b/tree-sitter-mozcpp/package.json
@@ -13,7 +13,7 @@
     "nan": "^2.14.2"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.25.3"
+    "tree-sitter-cli": "^0.25.4"
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
diff --git a/tree-sitter-mozcpp/src/parser.c b/tree-sitter-mozcpp/src/parser.c
index 7c68b9013..24c4a59e7 100644
--- a/tree-sitter-mozcpp/src/parser.c
+++ b/tree-sitter-mozcpp/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically generated by tree-sitter v0.25.3 (2a835ee029dca1c325e6f1c01dbce40396f6123e) */
+/* Automatically @generated by tree-sitter v0.25.4 (726dcd1e872149d95de581589fc408fb8ea9cb0b) */
 
 #include "tree_sitter/parser.h"
 
diff --git a/tree-sitter-mozcpp/src/tree_sitter/parser.h b/tree-sitter-mozcpp/src/tree_sitter/parser.h
index cdbe64ccc..858107deb 100644
--- a/tree-sitter-mozcpp/src/tree_sitter/parser.h
+++ b/tree-sitter-mozcpp/src/tree_sitter/parser.h
@@ -18,7 +18,6 @@ typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
-typedef struct TSLanguageMetadata TSLanguageMetadata;
 typedef struct TSLanguageMetadata {
   uint8_t major_version;
   uint8_t minor_version;
diff --git a/tree-sitter-mozjs/Cargo.toml b/tree-sitter-mozjs/Cargo.toml
index b1f3915fe..31247c922 100644
--- a/tree-sitter-mozjs/Cargo.toml
+++ b/tree-sitter-mozjs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-mozjs"
 description = "Mozjs grammar for the tree-sitter parsing library"
-version = "0.20.3"
+version = "0.20.4"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
@@ -33,4 +33,4 @@ tree-sitter-javascript = "0.23.1"
 build = ["tree-sitter-javascript"]
 
 [dev-dependencies]
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
diff --git a/tree-sitter-mozjs/bindings/rust/README.md b/tree-sitter-mozjs/bindings/rust/README.md
index a6bd19573..a48a724cb 100644
--- a/tree-sitter-mozjs/bindings/rust/README.md
+++ b/tree-sitter-mozjs/bindings/rust/README.md
@@ -8,7 +8,7 @@ way.)
 
 ``` toml
 [dependencies]
-tree-sitter = "0.25.3"
+tree-sitter = "0.25.4"
 tree-sitter-mozjs = "0.20.3"
 ```
 
diff --git a/tree-sitter-mozjs/package.json b/tree-sitter-mozjs/package.json
index d20d76c9f..19c4d0e85 100644
--- a/tree-sitter-mozjs/package.json
+++ b/tree-sitter-mozjs/package.json
@@ -13,7 +13,7 @@
     "nan": "^2.14.2"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.25.3"
+    "tree-sitter-cli": "^0.25.4"
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
diff --git a/tree-sitter-mozjs/src/parser.c b/tree-sitter-mozjs/src/parser.c
index e47859579..97ef9139f 100644
--- a/tree-sitter-mozjs/src/parser.c
+++ b/tree-sitter-mozjs/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically generated by tree-sitter v0.25.3 (2a835ee029dca1c325e6f1c01dbce40396f6123e) */
+/* Automatically @generated by tree-sitter v0.25.4 (726dcd1e872149d95de581589fc408fb8ea9cb0b) */
 
 #include "tree_sitter/parser.h"
 
diff --git a/tree-sitter-mozjs/src/tree_sitter/parser.h b/tree-sitter-mozjs/src/tree_sitter/parser.h
index cdbe64ccc..858107deb 100644
--- a/tree-sitter-mozjs/src/tree_sitter/parser.h
+++ b/tree-sitter-mozjs/src/tree_sitter/parser.h
@@ -18,7 +18,6 @@ typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
-typedef struct TSLanguageMetadata TSLanguageMetadata;
 typedef struct TSLanguageMetadata {
   uint8_t major_version;
   uint8_t minor_version;
diff --git a/tree-sitter-preproc/Cargo.toml b/tree-sitter-preproc/Cargo.toml
index 85a564fce..5aa6ff947 100644
--- a/tree-sitter-preproc/Cargo.toml
+++ b/tree-sitter-preproc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-preproc"
 description = "Preproc grammar for the tree-sitter parsing library"
-version = "0.20.3"
+version = "0.20.4"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
@@ -27,4 +27,4 @@ tree-sitter-language="0.1.0"
 cc = "^1.0"
 
 [dev-dependencies]
-tree-sitter = "=0.25.3"
+tree-sitter = "=0.25.4"
diff --git a/tree-sitter-preproc/bindings/rust/README.md b/tree-sitter-preproc/bindings/rust/README.md
index 5b3baa687..6aa8cb109 100644
--- a/tree-sitter-preproc/bindings/rust/README.md
+++ b/tree-sitter-preproc/bindings/rust/README.md
@@ -8,7 +8,7 @@ way.)
 
 ``` toml
 [dependencies]
-tree-sitter = "0.25.3"
+tree-sitter = "0.25.4"
 tree-sitter-preproc = "0.20.3"
 ```
 
diff --git a/tree-sitter-preproc/package.json b/tree-sitter-preproc/package.json
index 65ae80aa0..4675d571d 100644
--- a/tree-sitter-preproc/package.json
+++ b/tree-sitter-preproc/package.json
@@ -13,7 +13,7 @@
     "nan": "^2.14.2"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.25.3"
+    "tree-sitter-cli": "^0.25.4"
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
diff --git a/tree-sitter-preproc/src/parser.c b/tree-sitter-preproc/src/parser.c
index e55ea82c4..446e0c0c3 100644
--- a/tree-sitter-preproc/src/parser.c
+++ b/tree-sitter-preproc/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically generated by tree-sitter v0.25.3 (2a835ee029dca1c325e6f1c01dbce40396f6123e) */
+/* Automatically @generated by tree-sitter v0.25.4 (726dcd1e872149d95de581589fc408fb8ea9cb0b) */
 
 #include "tree_sitter/parser.h"
 
diff --git a/tree-sitter-preproc/src/tree_sitter/parser.h b/tree-sitter-preproc/src/tree_sitter/parser.h
index cdbe64ccc..858107deb 100644
--- a/tree-sitter-preproc/src/tree_sitter/parser.h
+++ b/tree-sitter-preproc/src/tree_sitter/parser.h
@@ -18,7 +18,6 @@ typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
-typedef struct TSLanguageMetadata TSLanguageMetadata;
 typedef struct TSLanguageMetadata {
   uint8_t major_version;
   uint8_t minor_version;