Align small_url_encode and Escape

Author: bugadani

src/librustdoc/html/escape.rs

@@ -17,22 +17,17 @@ impl<'a> fmt::Display for Escape<'a> {
         let pile_o_bits = s;
         let mut last = 0;
         for (i, ch) in s.bytes().enumerate() {
-            match ch as char {
-                '<' | '>' | '&' | '\'' | '"' => {
-                    fmt.write_str(&pile_o_bits[last..i])?;
-                    let s = match ch as char {
-                        '>' => "&gt;",
-                        '<' => "&lt;",
-                        '&' => "&amp;",
-                        '\'' => "&#39;",
-                        '"' => "&quot;",
-                        _ => unreachable!(),
-                    };
-                    fmt.write_str(s)?;
-                    last = i + 1;
-                }
-                _ => {}
-            }
+            let s = match ch as char {
+                '>' => "&gt;",
+                '<' => "&lt;",
+                '&' => "&amp;",
+                '\'' => "&#39;",
+                '"' => "&quot;",
+                _ => continue,
+            };
+            fmt.write_str(&pile_o_bits[last..i])?;
+            fmt.write_str(s)?;
+            last = i + 1;
         }
 
         if last < s.len() {

src/librustdoc/html/render/mod.rs

@@ -4267,8 +4267,8 @@ fn get_methods(
 fn small_url_encode(s: String) -> String {
     let mut st = String::new();
     let mut last_match = 0;
-    for (idx, c) in s.char_indices() {
-        let escaped = match c {
+    for (idx, c) in s.bytes().enumerate() {
+        let escaped = match c as char {
             '<' => "%3C",
             '>' => "%3E",
             ' ' => "%20",
@@ -4286,7 +4286,7 @@ fn small_url_encode(s: String) -> String {
 
         st += &s[last_match..idx];
         st += escaped;
-        last_match = idx + c.len_utf8();
+        last_match = idx + 1;
     }
 
     if last_match != 0 {