---

yaml
---
r: 22079
b: refs/heads/snap-stage3
c: a2ba952
h: refs/heads/master
i:
  22077: 6bedb10
  22075: 7e3c8d4
  22071: 18875bc
  22063: b27e7ee
  22047: c666432
  22015: 191ea3f
v: v3

Author: graydon

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 49d00b2f22576e7043a27f444804f563100212fe
+refs/heads/snap-stage3: a2ba952ff4f1648ae4a0b3123da62aac2dbe724d
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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