1 files changed, 40 insertions, 38 deletions

diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index ad6d74162..0a35e25d5 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -243,6 +243,8 @@ Grammar(
         "PARAM",
         "SELF_PARAM",
         "ARG_LIST",
+        "TYPE_BOUND",
+        "TYPE_BOUND_LIST",
     ],
     ast: {
         "SourceFile": (
@@ -293,7 +295,7 @@ Grammar(
         "EnumVariantList": ( collections: [["variants", "EnumVariant"]] ),
         "EnumVariant": ( traits: ["NameOwner", "DocCommentsOwner", "AttrsOwner"], options: ["Expr"] ),
         "TraitDef": (
-            traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner", "TypeParamsOwner"],
+            traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner", "TypeParamsOwner", "TypeBoundsOwner"],
             options: ["ItemList"]
         ),
         "Module": (
@@ -313,6 +315,7 @@ Grammar(
                 "DocCommentsOwner",
                 "TypeAscriptionOwner",
             ],
+            options: [ ["body","Expr"]],
         ),
         "StaticDef": (
             traits: [
@@ -323,6 +326,7 @@ Grammar(
                 "DocCommentsOwner",
                 "TypeAscriptionOwner",
             ],
+            options: [ ["body","Expr"]],
         ),
         "TypeAliasDef": (
             traits: [
@@ -330,7 +334,8 @@ Grammar(
                 "NameOwner",
                 "TypeParamsOwner",
                 "AttrsOwner",
-                "DocCommentsOwner"
+                "DocCommentsOwner",
+                "TypeBoundsOwner",
             ],
             options: ["TypeRef"]
         ),
@@ -347,8 +352,12 @@ Grammar(
         "PlaceholderType": (),
         "FnPointerType": (options: ["ParamList", "RetType"]),
         "ForType": (options: ["TypeRef"]),
-        "ImplTraitType": (),
-        "DynTraitType": (),
+        "ImplTraitType": (
+            traits: ["TypeBoundsOwner"],
+        ),
+        "DynTraitType": (
+            traits: ["TypeBoundsOwner"],
+        ),
 
         "TypeRef": ( enum: [
             "ParenType",
@@ -456,31 +465,7 @@ Grammar(
         "RangeExpr": (),
         "BinExpr": (),
 
-        "IntNumber": ( traits: ["AstToken"] ),
-        "FloatNumber": ( traits: ["AstToken"] ),
-        "String": ( traits: ["AstToken"] ),
-        "RawString": ( traits: ["AstToken"] ),
-        "Byte": ( traits: ["AstToken"] ),
-        "RawByteString": ( traits: ["AstToken"] ),
-        "ByteString": ( traits: ["AstToken"] ),
-        "Char": ( traits: ["AstToken"] ),
-        "TrueKw": ( traits: ["AstToken"] ),
-        "FalseKw": ( traits: ["AstToken"] ),
-        "LiteralExpr": (
-            enum: [
-                "String",
-                "ByteString",
-                "RawString",
-                "RawByteString",
-                "Char",
-                "Byte",
-                "IntNumber",
-                "FloatNumber",
-                "TrueKw",
-                "FalseKw",
-            ]
-        ),
-        "Literal": (options: ["LiteralExpr"]),
+        "Literal": (),
 
         "Expr": (
             enum: [
@@ -511,6 +496,7 @@ Grammar(
                 "RangeExpr",
                 "BinExpr",
                 "Literal",
+                "MacroCall",
             ],
         ),
 
@@ -571,13 +557,33 @@ Grammar(
                 ["lifetime_params", "LifetimeParam" ],
             ]
         ),
-        "TypeParam": ( traits: ["NameOwner", "AttrsOwner"] ),
+        "TypeParam": ( traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"] ),
         "LifetimeParam": (
-            options: [ "Lifetime"],
             traits: ["AttrsOwner"],
         ),
-        "Lifetime": ( traits: ["AstToken"] ),
-        "WhereClause": (),
+        "TypeBound": (
+            options: [
+                "TypeRef",
+            ]
+        ),
+        "TypeBoundList": (
+            collections: [
+                ["bounds", "TypeBound"],
+            ]
+        ),
+        "WherePred": (
+            options: [
+                "TypeRef",
+            ],
+            traits: [
+                "TypeBoundsOwner",
+            ],
+        ),
+        "WhereClause": (
+            collections: [
+                ["predicates", "WherePred"],
+            ],
+        ),
         "ExprStmt": (
             options: [ ["expr", "Expr"] ]
         ),
@@ -612,12 +618,10 @@ Grammar(
             ]
         ),
         "SelfParam": (
-            options: ["SelfKw"],
             traits: [
                 "TypeAscriptionOwner",
             ]
         ),
-        "SelfKw": (),
         "Param": (
             options: [ "Pat" ],
             traits: [
@@ -661,8 +665,6 @@ Grammar(
         ]),
         "TypeArg": (options: ["TypeRef"]),
         "AssocTypeArg": (options: ["NameRef", "TypeRef"]),
-        "LifetimeArg": (options: ["Lifetime"]),
-        "Comment": ( traits: ["AstToken"] ),
-        "Whitespace": ( traits: ["AstToken"] ),
+        "LifetimeArg": (),
     },
 )