use len_utf8 instead of unicode-width, rename locals

Author: ratmice

lrlex/Cargo.toml

@@ -38,4 +38,3 @@ serde = { workspace = true, optional = true }
 prettyplease.workspace = true
 syn.workspace = true
 glob.workspace = true
-unicode-width.workspace = true

lrlex/src/lib/parser.rs

@@ -686,27 +686,26 @@ where
 }
 
 fn trim_end_unescaped(s: &str) -> &str {
-    use unicode_width::UnicodeWidthChar;
     let mut cbuf = [0; 4];
-    let mut initial_space_bytes = 0;
-    let mut last_char_width = 0;
+    let mut total_ws_bytes = 0;
+    let mut last_ws_char_len = 0;
     // First loop over spaces
     for ch in s.chars().rev().into_iter() {
         if RE_SPACE_SEP.is_match(ch.encode_utf8(&mut cbuf)) {
-            last_char_width = ch.width().unwrap_or(0);
-            initial_space_bytes += last_char_width;
+            last_ws_char_len = ch.len_utf8();
+            total_ws_bytes += last_ws_char_len;
         } else {
             break;
         }
     }
-    if initial_space_bytes == 0 {
+    if total_ws_bytes == 0 {
         return s;
     }
     let mut preceeding_backslashes = 0;
     // Next loop over escaped slashes or spaces,
     // an even number of backslashes are all escaping slashes,
     // and an odd number of backslashes must have a trailing escaped space.
-    for c in s[..s.len() - initial_space_bytes].chars().rev() {
+    for c in s[..s.len() - total_ws_bytes].chars().rev() {
         if c == '\\' {
             preceeding_backslashes += 1
         } else {
@@ -716,10 +715,10 @@ fn trim_end_unescaped(s: &str) -> &str {
     // The backslash count was odd, the last must escape a space.
     // Drop one of the intial spaces from the trim.
     if preceeding_backslashes % 2 == 1 {
-        initial_space_bytes -= last_char_width;
+        total_ws_bytes -= last_ws_char_len;
     }
 
-    &s[..s.len() - initial_space_bytes]
+    &s[..s.len() - total_ws_bytes]
 }
 
 #[cfg(test)]