rollup merge of #19885: alexcrichton/char-escape

This changes the `escape_unicode` method on a `char` to use the new style of
unicode escapes in the language.

Closes #19811
Closes #19879

1 files changed, 19 insertions, 22 deletions

diff --git a/src/libcoretest/char.rs b/src/libcoretest/char.rs
index e5561bebb22..bed38f8c296 100644
--- a/src/libcoretest/char.rs
+++ b/src/libcoretest/char.rs
@@ -135,38 +135,35 @@ fn test_escape_default() {
     let s = string('~');
     assert_eq!(s, "~");
     let s = string('\x00');
-    assert_eq!(s, "\\x00");
+    assert_eq!(s, "\\u{0}");
     let s = string('\x1f');
-    assert_eq!(s, "\\x1f");
+    assert_eq!(s, "\\u{1f}");
     let s = string('\x7f');
-    assert_eq!(s, "\\x7f");
-    let s = string('\u00ff');
-    assert_eq!(s, "\\u00ff");
-    let s = string('\u011b');
-    assert_eq!(s, "\\u011b");
-    let s = string('\U0001d4b6');
-    assert_eq!(s, "\\U0001d4b6");
+    assert_eq!(s, "\\u{7f}");
+    let s = string('\u{ff}');
+    assert_eq!(s, "\\u{ff}");
+    let s = string('\u{11b}');
+    assert_eq!(s, "\\u{11b}");
+    let s = string('\u{1d4b6}');
+    assert_eq!(s, "\\u{1d4b6}");
 }
 
 #[test]
 fn test_escape_unicode() {
-    fn string(c: char) -> String {
-        let mut result = String::new();
-        escape_unicode(c, |c| { result.push(c); });
-        return result;
-    }
+    fn string(c: char) -> String { c.escape_unicode().collect() }
+
     let s = string('\x00');
-    assert_eq!(s, "\\x00");
+    assert_eq!(s, "\\u{0}");
     let s = string('\n');
-    assert_eq!(s, "\\x0a");
+    assert_eq!(s, "\\u{a}");
     let s = string(' ');
-    assert_eq!(s, "\\x20");
+    assert_eq!(s, "\\u{20}");
     let s = string('a');
-    assert_eq!(s, "\\x61");
-    let s = string('\u011b');
-    assert_eq!(s, "\\u011b");
-    let s = string('\U0001d4b6');
-    assert_eq!(s, "\\U0001d4b6");
+    assert_eq!(s, "\\u{61}");
+    let s = string('\u{11b}');
+    assert_eq!(s, "\\u{11b}");
+    let s = string('\u{1d4b6}');
+    assert_eq!(s, "\\u{1d4b6}");
 }
 
 #[test]