ampersand -> amp

6 files changed, 21 insertions, 21 deletions

diff --git a/src/grammar.ron b/src/grammar.ron
index d5bdb206c..df769bba6 100644
--- a/src/grammar.ron
+++ b/src/grammar.ron
@@ -15,7 +15,7 @@ Grammar(
         ["~", "TILDE"],
         ["?", "QUESTION"],
         ["$", "DOLLAR"],
-        ["&", "AMPERSAND"],
+        ["&", "AMP"],
         ["|", "PIPE"],
         ["+", "PLUS"],
         ["*", "STAR"],
@@ -41,7 +41,7 @@ Grammar(
         [">=", "GTEQ"],
         ["+=", "PLUSEQ"],
         ["-=", "MINUSEQ"],
-        ["&&", "AMPERSANDAMPERSAND"],
+        ["&&", "AMPAMP"],
         ["||", "PIPEPIPE"],
     ],
     keywords: [
diff --git a/src/grammar/expressions/mod.rs b/src/grammar/expressions/mod.rs
index 18e3f5798..e0b4ced74 100644
--- a/src/grammar/expressions/mod.rs
+++ b/src/grammar/expressions/mod.rs
@@ -68,8 +68,8 @@ fn current_op(p: &Parser) -> (u8, Op) {
     if p.at_compound2(PIPE, PIPE) {
         return (3, Op::Composite(PIPEPIPE, 2));
     }
-    if p.at_compound2(AMPERSAND, AMPERSAND) {
-        return (4, Op::Composite(AMPERSANDAMPERSAND, 2));
+    if p.at_compound2(AMP, AMP) {
+        return (4, Op::Composite(AMPAMP, 2));
     }
     if p.at_compound2(L_ANGLE, EQ) {
         return (5, Op::Composite(LTEQ, 2));
@@ -113,7 +113,7 @@ fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) {
 
 const UNARY_EXPR_FIRST: TokenSet =
     token_set_union![
-        token_set![AMPERSAND, STAR, EXCL],
+        token_set![AMP, STAR, EXCL],
         atom::ATOM_EXPR_FIRST,
     ];
 
@@ -125,7 +125,7 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> {
         //     let _ = &1;
         //     let _ = &mut &f();
         // }
-        AMPERSAND => {
+        AMP => {
             m = p.start();
             p.bump();
             p.eat(MUT_KW);
diff --git a/src/grammar/params.rs b/src/grammar/params.rs
index be985c80f..034542df1 100644
--- a/src/grammar/params.rs
+++ b/src/grammar/params.rs
@@ -53,10 +53,10 @@ fn self_param(p: &mut Parser) {
     let la3 = p.nth(3);
     let n_toks = match (p.current(), la1, la2, la3) {
         (SELF_KW, _, _, _) => 1,
-        (AMPERSAND, SELF_KW, _, _) => 2,
-        (AMPERSAND, MUT_KW, SELF_KW, _) => 3,
-        (AMPERSAND, LIFETIME, SELF_KW, _) => 3,
-        (AMPERSAND, LIFETIME, MUT_KW, SELF_KW) => 4,
+        (AMP, SELF_KW, _, _) => 2,
+        (AMP, MUT_KW, SELF_KW, _) => 3,
+        (AMP, LIFETIME, SELF_KW, _) => 3,
+        (AMP, LIFETIME, MUT_KW, SELF_KW) => 4,
         _ => return,
     };
     let m = p.start();
diff --git a/src/grammar/patterns.rs b/src/grammar/patterns.rs
index 770274686..d67f180fa 100644
--- a/src/grammar/patterns.rs
+++ b/src/grammar/patterns.rs
@@ -15,7 +15,7 @@ pub(super) fn pattern(p: &mut Parser) {
 
     match la0 {
         UNDERSCORE => placeholder_pat(p),
-        AMPERSAND => ref_pat(p),
+        AMP => ref_pat(p),
         _ => p.err_and_bump("expected pattern"),
     }
 }
@@ -108,7 +108,7 @@ fn placeholder_pat(p: &mut Parser) {
 //     let &mut b = ();
 // }
 fn ref_pat(p: &mut Parser) {
-    assert!(p.at(AMPERSAND));
+    assert!(p.at(AMP));
     let m = p.start();
     p.bump();
     p.eat(MUT_KW);
diff --git a/src/grammar/types.rs b/src/grammar/types.rs
index 565037cb0..9e63c9b2a 100644
--- a/src/grammar/types.rs
+++ b/src/grammar/types.rs
@@ -6,7 +6,7 @@ pub(super) fn type_(p: &mut Parser) {
         EXCL => never_type(p),
         STAR => pointer_type(p),
         L_BRACK => array_or_slice_type(p),
-        AMPERSAND => reference_type(p),
+        AMP => reference_type(p),
         UNDERSCORE => placeholder_type(p),
         FN_KW | UNSAFE_KW | EXTERN_KW => fn_pointer_type(p),
         FOR_KW => for_type(p),
@@ -130,7 +130,7 @@ fn array_or_slice_type(p: &mut Parser) {
 // type B = &'static ();
 // type C = &mut ();
 fn reference_type(p: &mut Parser) {
-    assert!(p.at(AMPERSAND));
+    assert!(p.at(AMP));
     let m = p.start();
     p.bump();
     p.eat(LIFETIME);
diff --git a/src/syntax_kinds/generated.rs b/src/syntax_kinds/generated.rs
index 20f01c505..1bce34443 100644
--- a/src/syntax_kinds/generated.rs
+++ b/src/syntax_kinds/generated.rs
@@ -20,7 +20,7 @@ pub enum SyntaxKind {
     TILDE,
     QUESTION,
     DOLLAR,
-    AMPERSAND,
+    AMP,
     PIPE,
     PLUS,
     STAR,
@@ -44,7 +44,7 @@ pub enum SyntaxKind {
     GTEQ,
     PLUSEQ,
     MINUSEQ,
-    AMPERSANDAMPERSAND,
+    AMPAMP,
     PIPEPIPE,
     USE_KW,
     FN_KW,
@@ -251,7 +251,7 @@ impl SyntaxKind {
             TILDE => &SyntaxInfo { name: "TILDE" },
             QUESTION => &SyntaxInfo { name: "QUESTION" },
             DOLLAR => &SyntaxInfo { name: "DOLLAR" },
-            AMPERSAND => &SyntaxInfo { name: "AMPERSAND" },
+            AMP => &SyntaxInfo { name: "AMP" },
             PIPE => &SyntaxInfo { name: "PIPE" },
             PLUS => &SyntaxInfo { name: "PLUS" },
             STAR => &SyntaxInfo { name: "STAR" },
@@ -275,7 +275,7 @@ impl SyntaxKind {
             GTEQ => &SyntaxInfo { name: "GTEQ" },
             PLUSEQ => &SyntaxInfo { name: "PLUSEQ" },
             MINUSEQ => &SyntaxInfo { name: "MINUSEQ" },
-            AMPERSANDAMPERSAND => &SyntaxInfo { name: "AMPERSANDAMPERSAND" },
+            AMPAMP => &SyntaxInfo { name: "AMPAMP" },
             PIPEPIPE => &SyntaxInfo { name: "PIPEPIPE" },
             USE_KW => &SyntaxInfo { name: "USE_KW" },
             FN_KW => &SyntaxInfo { name: "FN_KW" },
@@ -473,7 +473,7 @@ impl SyntaxKind {
             '~' => TILDE,
             '?' => QUESTION,
             '$' => DOLLAR,
-            '&' => AMPERSAND,
+            '&' => AMP,
             '|' => PIPE,
             '+' => PLUS,
             '*' => STAR,
@@ -502,7 +502,7 @@ impl SyntaxKind {
             TILDE => "~",
             QUESTION => "?",
             DOLLAR => "$",
-            AMPERSAND => "&",
+            AMP => "&",
             PIPE => "|",
             PLUS => "+",
             STAR => "*",
@@ -526,7 +526,7 @@ impl SyntaxKind {
             GTEQ => ">=",
             PLUSEQ => "+=",
             MINUSEQ => "-=",
-            AMPERSANDAMPERSAND => "&&",
+            AMPAMP => "&&",
             PIPEPIPE => "||",
 
             USE_KW => "use",