---

yaml
---
r: 24187
b: refs/heads/master
c: a2ba952
h: refs/heads/master
i:
  24185: 7e28a18
  24183: d5bf1e8
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 49d00b2f22576e7043a27f444804f563100212fe
+refs/heads/master: a2ba952ff4f1648ae4a0b3123da62aac2dbe724d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/rust.md

@@ -118,19 +118,16 @@ production. See [tokens](#tokens) for more information.
 
 ## Input format
 
-Rust input is interpreted as a sequence of Unicode codepoints encoded in
-UTF-8. No normalization is performed during input processing. Most Rust
-grammar rules are defined in terms of printable ASCII-range codepoints, but
-a small number are defined in terms of Unicode properties or explicit
-codepoint lists. ^[Surrogate definitions for the special Unicode productions
-are provided to the grammar verifier, restricted to ASCII range, when
-verifying the grammar in this document.]
+Rust input is interpreted as a sequence of Unicode codepoints encoded in UTF-8,
+normalized to Unicode normalization form NFKC.
+Most Rust grammar rules are defined in terms of printable ASCII-range codepoints,
+but a small number are defined in terms of Unicode properties or explicit codepoint lists.
+^[Substitute definitions for the special Unicode productions are provided to the grammar verifier, restricted to ASCII range, when verifying the grammar in this document.]
 
 ## Special Unicode Productions
 
-The following productions in the Rust grammar are defined in terms of
-Unicode properties: `ident`, `non_null`, `non_star`, `non_eol`, `non_slash`,
-`non_single_quote` and `non_double_quote`.
+The following productions in the Rust grammar are defined in terms of Unicode properties:
+`ident`, `non_null`, `non_star`, `non_eol`, `non_slash`, `non_single_quote` and `non_double_quote`.
 
 ### Identifiers