Update

Author: Yue Fei

Cargo.lock

@@ -2,6 +2,7 @@ use std::env::{consts::EXE_SUFFIX, split_paths};
 use std::ffi::{OsStr, OsString};
 use std::fmt;
 use std::io::Write;
+use std::ops::Deref;
 use std::os::windows::ffi::OsStrExt;
 use std::path::Path;
 use std::process::Command;
@@ -530,9 +531,8 @@ fn _add_to_path(old_path: HSTRING, path_str: HSTRING) -> Option<HSTRING> {
     if old_path.is_empty() {
         Some(path_str)
     } else if old_path
-        .as_wide()
         .windows(path_str.len())
-        .any(|path| path == path_str.as_wide())
+        .any(|path| path == path_str.deref())
     {
         None
     } else {
@@ -546,20 +546,19 @@ fn _add_to_path(old_path: HSTRING, path_str: HSTRING) -> Option<HSTRING> {
 // Returns None if the existing old_path does not need changing
 fn _remove_from_path(old_path: HSTRING, path_str: HSTRING) -> Option<HSTRING> {
     let idx = old_path
-        .as_wide()
         .windows(path_str.len())
-        .position(|path| path == path_str.as_wide())?;
+        .position(|path| path == path_str.deref())?;
     // If there's a trailing semicolon (likely, since we probably added one
     // during install), include that in the substring to remove. We don't search
     // for that to find the string, because if it's the last string in the path,
     // there may not be.
     let mut len = path_str.len();
-    if old_path.as_wide().get(idx + path_str.len()) == Some(&(b';' as u16)) {
+    if old_path.get(idx + path_str.len()) == Some(&(b';' as u16)) {
         len += 1;
     }
 
-    let mut new_path = old_path.as_wide()[..idx].to_owned();
-    new_path.extend_from_slice(&old_path.as_wide()[idx + len..]);
+    let mut new_path = old_path[..idx].to_owned();
+    new_path.extend_from_slice(&old_path[idx + len..]);
     // Don't leave a trailing ; though, we don't want an empty string in the
     // path.
     if new_path.last() == Some(&(b';' as u16)) {