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

diff --cc src/libcollections/str.rs
Simple merge

diff --cc src/libcore/char.rs
Simple merge