3 files changed, 22 insertions, 127 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 1386fc4e7..adc191254 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -113,12 +113,12 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "TUPLE_TYPE",
         "NEVER_TYPE",
         "PATH_TYPE",
-        "POINTER_TYPE",
+        "PTR_TYPE",
         "ARRAY_TYPE",
         "SLICE_TYPE",
-        "REFERENCE_TYPE",
+        "REF_TYPE",
         "INFER_TYPE",
-        "FN_POINTER_TYPE",
+        "FN_PTR_TYPE",
         "FOR_TYPE",
         "IMPL_TRAIT_TYPE",
         "DYN_TRAIT_TYPE",
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 4602ff1d7..cafad8070 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -10,7 +10,7 @@ use std::{
 
 use proc_macro2::{Punct, Spacing};
 use quote::{format_ident, quote};
-use ungrammar::{Grammar, Rule};
+use ungrammar::{rust_grammar, Grammar, Rule};
 
 use crate::{
     ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Cardinality, Field, KindsSrc, KINDS_SRC},
@@ -19,9 +19,7 @@ use crate::{
 };
 
 pub fn generate_syntax(mode: Mode) -> Result<()> {
-    let grammar = include_str!("rust.ungram")
-        .parse::<Grammar>()
-        .unwrap_or_else(|err| panic!("\n    \x1b[91merror\x1b[0m: {}\n", err));
+    let grammar = rust_grammar();
     let ast = lower(&grammar);
 
     let syntax_kinds_file = project_root().join(codegen::SYNTAX_KINDS);
@@ -538,6 +536,7 @@ fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {
     for alternative in alternatives {
         match alternative {
             Rule::Node(it) => variants.push(grammar[*it].name.clone()),
+            Rule::Token(it) if grammar[*it].name == ";" => (),
             _ => return None,
         }
     }
@@ -591,8 +590,8 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, r
                     | "index"
                     | "base"
                     | "value"
-                    | "target_type"
-                    | "target_trait"
+                    | "trait"
+                    | "self_ty"
             );
             if manually_implemented {
                 return;
diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs
index 9ac3fa51d..4bade2c7e 100644
--- a/xtask/src/metrics.rs
+++ b/xtask/src/metrics.rs
@@ -1,7 +1,6 @@
 use std::{
     collections::BTreeMap,
     env,
-    fmt::{self, Write as _},
     io::Write as _,
     path::Path,
     time::{Instant, SystemTime, UNIX_EPOCH},
@@ -127,40 +126,21 @@ impl Metrics {
         self.metrics.insert(name.into(), (value, unit));
     }
 
-    fn json(&self) -> Json {
-        let mut json = Json::default();
-        self.to_json(&mut json);
-        json
+    fn json(&self) -> String {
+        let mut buf = String::new();
+        self.to_json(write_json::object(&mut buf));
+        buf
     }
-    fn to_json(&self, json: &mut Json) {
-        json.begin_object();
-        {
-            json.field("host");
-            self.host.to_json(json);
-
-            json.field("timestamp");
-            let timestamp = self.timestamp.duration_since(UNIX_EPOCH).unwrap();
-            json.number(timestamp.as_secs() as f64);
 
-            json.field("revision");
-            json.string(&self.revision);
-
-            json.field("metrics");
-            json.begin_object();
-            {
-                for (k, (value, unit)) in &self.metrics {
-                    json.field(k);
-                    json.begin_array();
-                    {
-                        json.number(*value as f64);
-                        json.string(unit);
-                    }
-                    json.end_array();
-                }
-            }
-            json.end_object()
+    fn to_json(&self, mut obj: write_json::Object<'_>) {
+        self.host.to_json(obj.object("host"));
+        let timestamp = self.timestamp.duration_since(UNIX_EPOCH).unwrap();
+        obj.number("timestamp", timestamp.as_secs() as f64);
+        obj.string("revision", &self.revision);
+        let mut metrics = obj.object("metrics");
+        for (k, (value, unit)) in &self.metrics {
+            metrics.array(k).number(*value as f64).string(unit);
         }
-        json.end_object();
     }
 }
 
@@ -189,91 +169,7 @@ impl Host {
             Ok(line[field.len()..].trim().to_string())
         }
     }
-    fn to_json(&self, json: &mut Json) {
-        json.begin_object();
-        {
-            json.field("os");
-            json.string(&self.os);
-
-            json.field("cpu");
-            json.string(&self.cpu);
-
-            json.field("mem");
-            json.string(&self.mem);
-        }
-        json.end_object();
-    }
-}
-
-struct State {
-    obj: bool,
-    first: bool,
-}
-
-#[derive(Default)]
-struct Json {
-    stack: Vec<State>,
-    buf: String,
-}
-
-impl Json {
-    fn begin_object(&mut self) {
-        self.stack.push(State { obj: true, first: true });
-        self.buf.push('{');
-    }
-    fn end_object(&mut self) {
-        self.stack.pop();
-        self.buf.push('}')
-    }
-    fn begin_array(&mut self) {
-        self.stack.push(State { obj: false, first: true });
-        self.buf.push('[');
-    }
-    fn end_array(&mut self) {
-        self.stack.pop();
-        self.buf.push(']')
-    }
-    fn field(&mut self, name: &str) {
-        self.object_comma();
-        self.string_token(name);
-        self.buf.push(':');
-    }
-    fn string(&mut self, value: &str) {
-        self.array_comma();
-        self.string_token(value);
-    }
-    fn string_token(&mut self, value: &str) {
-        self.buf.push('"');
-        self.buf.extend(value.escape_default());
-        self.buf.push('"');
-    }
-    fn number(&mut self, value: f64) {
-        self.array_comma();
-        write!(self.buf, "{}", value).unwrap();
-    }
-
-    fn array_comma(&mut self) {
-        let state = self.stack.last_mut().unwrap();
-        if state.obj {
-            return;
-        }
-        if !state.first {
-            self.buf.push(',');
-        }
-        state.first = false;
-    }
-
-    fn object_comma(&mut self) {
-        let state = self.stack.last_mut().unwrap();
-        if !state.first {
-            self.buf.push(',');
-        }
-        state.first = false;
-    }
-}
-
-impl fmt::Display for Json {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.buf)
+    fn to_json(&self, mut obj: write_json::Object<'_>) {
+        obj.string("os", &self.os).string("cpu", &self.cpu).string("mem", &self.mem);
     }
 }