@@ -308,10 +308,10 @@ mod prim_never {}
308308/// let _ = unsafe { char::from_u32_unchecked(0x110000) };
309309/// ```
310310///
311- /// USVs are also the exact set of values that may be encoded in UTF-8. Because `char` values are
312- /// USVs and functions may assume [incoming `str` values are valid
313- /// UTF-8](primitive.str.html#invariant), it is safe to store any `char` in a `str` or read any
314- /// character from a `str` as a `char`.
311+ /// Unicode scalar values are also the exact set of values that may be encoded in UTF-8. Because
312+ /// `char` values are Unicode scalar values and functions may assume [incoming `str` values are
313+ /// valid UTF-8](primitive.str.html#invariant), it is safe to store any `char` in a `str` or read
314+ /// any character from a `str` as a `char`.
315315///
316316/// The gap in valid `char` values is understood by the compiler, so in the
317317/// below example the two ranges are understood to cover the whole range of
@@ -325,11 +325,10 @@ mod prim_never {}
325325/// };
326326/// ```
327327///
328- /// All USVs are valid `char` values, but not all of them represent a real
329- /// character. Many USVs are not currently assigned to a character, but may be
330- /// in the future ("reserved"); some will never be a character
331- /// ("noncharacters"); and some may be given different meanings by different
332- /// users ("private use").
328+ /// All Unicode scalar values are valid `char` values, but not all of them represent a real
329+ /// character. Many Unicode scalar values are not currently assigned to a character, but may be in
330+ /// the future ("reserved"); some will never be a character ("noncharacters"); and some may be given
331+ /// different meanings by different users ("private use").
333332///
334333/// [Unicode code point]: https://www.unicode.org/glossary/#code_point
335334/// [Unicode scalar value]: https://www.unicode.org/glossary/#unicode_scalar_value
0 commit comments