Merge #20

20: Replace self/super/crate in PathSegment with NameRef r=matklad a=Veykril



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ungrammar"
 description = "A DSL for describing concrete syntax trees"
-version = "1.7.0"
+version = "1.8.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/matklad/ungrammar"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]

rust.ungram

@@ -24,7 +24,7 @@ Name =
   'ident'
 
 NameRef =
-  'ident' | 'int_number'
+  'ident' | 'int_number' | 'self' | 'super' | 'crate'
 
 Lifetime =
   'lifetime_ident'
@@ -33,8 +33,7 @@ Path =
   (qualifier:Path '::')? segment:PathSegment
 
 PathSegment =
-  'crate' | 'self' | 'super'
-| '::'? NameRef
+  '::'? NameRef
 | NameRef GenericArgList?
 | NameRef ParamList RetType?
 | '<' PathType ('as' PathType)? '>'