Rename `char::escape` to `char::escape_debug` and add tracking issue

2 files changed, 14 insertions, 14 deletions

diff --git a/src/libcore/char.rs b/src/libcore/char.rs
index 3e435b47110..a3440fe8aa6 100644
--- a/src/libcore/char.rs
+++ b/src/libcore/char.rs
@@ -264,8 +264,8 @@ pub trait CharExt {
     fn escape_unicode(self) -> EscapeUnicode;
     #[stable(feature = "core", since = "1.6.0")]
     fn escape_default(self) -> EscapeDefault;
-    #[unstable(feature = "char_escape", issue = "0")]
-    fn escape(self) -> Escape;
+    #[unstable(feature = "char_escape_debug", issue = "35068")]
+    fn escape_debug(self) -> EscapeDebug;
     #[stable(feature = "core", since = "1.6.0")]
     fn len_utf8(self) -> usize;
     #[stable(feature = "core", since = "1.6.0")]
@@ -330,7 +330,7 @@ impl CharExt for char {
     }
 
     #[inline]
-    fn escape(self) -> Escape {
+    fn escape_debug(self) -> EscapeDebug {
         let init_state = match self {
             '\t' => EscapeDefaultState::Backslash('t'),
             '\r' => EscapeDefaultState::Backslash('r'),
@@ -339,7 +339,7 @@ impl CharExt for char {
             c if is_printable(c) => EscapeDefaultState::Char(c),
             c => EscapeDefaultState::Unicode(c.escape_unicode()),
         };
-        Escape(EscapeDefault { state: init_state })
+        EscapeDebug(EscapeDefault { state: init_state })
     }
 
     #[inline]
@@ -618,24 +618,24 @@ impl ExactSizeIterator for EscapeDefault {
 
 /// An iterator that yields the literal escape code of a `char`.
 ///
-/// This `struct` is created by the [`escape()`] method on [`char`]. See its
+/// This `struct` is created by the [`escape_debug()`] method on [`char`]. See its
 /// documentation for more.
 ///
-/// [`escape()`]: ../../std/primitive.char.html#method.escape
+/// [`escape_debug()`]: ../../std/primitive.char.html#method.escape_debug
 /// [`char`]: ../../std/primitive.char.html
-#[unstable(feature = "char_escape", issue = "0")]
+#[unstable(feature = "char_escape_debug", issue = "35068")]
 #[derive(Clone, Debug)]
-pub struct Escape(EscapeDefault);
+pub struct EscapeDebug(EscapeDefault);
 
-#[unstable(feature = "char_escape", issue = "0")]
-impl Iterator for Escape {
+#[unstable(feature = "char_escape_debug", issue = "35068")]
+impl Iterator for EscapeDebug {
     type Item = char;
     fn next(&mut self) -> Option<char> { self.0.next() }
     fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
 }
 
-#[unstable(feature = "char_escape", issue = "0")]
-impl ExactSizeIterator for Escape { }
+#[unstable(feature = "char_escape_debug", issue = "35068")]
+impl ExactSizeIterator for EscapeDebug { }
 
 /// An iterator over `u8` entries represending the UTF-8 encoding of a `char`
 /// value.
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 3bcdce57af0..173c55e35d5 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -1383,7 +1383,7 @@ impl Debug for str {
         f.write_char('"')?;
         let mut from = 0;
         for (i, c) in self.char_indices() {
-            let esc = c.escape();
+            let esc = c.escape_debug();
             // If char needs escaping, flush backlog so far and write, else skip
             if esc.len() != 1 {
                 f.write_str(&self[from..i])?;
@@ -1409,7 +1409,7 @@ impl Display for str {
 impl Debug for char {
     fn fmt(&self, f: &mut Formatter) -> Result {
         f.write_char('\'')?;
-        for c in self.escape() {
+        for c in self.escape_debug() {
             f.write_char(c)?
         }
         f.write_char('\'')