all references to PathBuf::as_mut_vec removed for UEFI platforms. Functions remain commented out in case of emergency.

Author: tnuha

library/std/src/ffi/os_str.rs

@@ -553,10 +553,10 @@ impl OsString {
     }
 
     /// Part of a hack to make PathBuf::push/pop more efficient.
-    #[inline]
-    pub(crate) fn as_mut_vec_for_path_buf(&mut self) -> &mut Vec<u8> {
-        self.inner.as_mut_vec_for_path_buf()
-    }
+    //#[inline]
+    //pub(crate) fn as_mut_vec_for_path_buf(&mut self) -> &mut Vec<u8> {
+    //    self.inner.as_mut_vec_for_path_buf()
+    //}
 
     /// More well behaving alternative to allowing outer types
     /// full mutable access to the core `Vec`.
@@ -565,6 +565,11 @@ impl OsString {
     pub(crate) fn truncate(&mut self, len: usize) {
         self.inner.truncate(len);
     }
+
+    #[inline]
+    pub(crate) fn extend_from_slice(&mut self, other: &[u8]) {
+        self.inner.extend_from_slice(other);
+    }
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]

library/std/src/path.rs

@@ -1163,10 +1163,10 @@ pub struct PathBuf {
 }
 
 impl PathBuf {
-    #[inline]
-    fn as_mut_vec(&mut self) -> &mut Vec<u8> {
-        self.inner.as_mut_vec_for_path_buf()
-    }
+    //#[inline]
+    //fn as_mut_vec(&mut self) -> &mut Vec<u8> {
+    //    self.inner.as_mut_vec_for_path_buf()
+    //}
 
     /// Allocates an empty `PathBuf`.
     ///
@@ -2645,18 +2645,18 @@ impl Path {
             None => {
                 // Enough capacity for the extension and the dot
                 let capacity = self_len + extension.len() + 1;
-                let whole_path = self_bytes.iter();
+                let whole_path = self_bytes;
                 (capacity, whole_path)
             }
             Some(previous_extension) => {
                 let capacity = self_len + extension.len() - previous_extension.len();
-                let path_till_dot = self_bytes[..self_len - previous_extension.len()].iter();
+                let path_till_dot = &self_bytes[..self_len - previous_extension.len()];
                 (capacity, path_till_dot)
             }
         };
 
         let mut new_path = PathBuf::with_capacity(new_capacity);
-        new_path.as_mut_vec().extend(slice_to_copy);
+        new_path.inner.extend_from_slice(slice_to_copy);
         new_path.set_extension(extension);
         new_path
     }

library/std/src/sys/os_str/bytes.rs

@@ -203,10 +203,10 @@ impl Buf {
     }
 
     /// Part of a hack to make PathBuf::push/pop more efficient.
-    #[inline]
-    pub(crate) fn as_mut_vec_for_path_buf(&mut self) -> &mut Vec<u8> {
-        &mut self.inner
-    }
+    //#[inline]
+    //pub(crate) fn as_mut_vec_for_path_buf(&mut self) -> &mut Vec<u8> {
+    //    &mut self.inner
+    //}
 
     /// More well behaving alternative to allowing outer types
     /// full mutable access to the core `Vec`.
@@ -215,6 +215,11 @@ impl Buf {
     pub(crate) fn truncate(&mut self, len: usize) {
         self.inner.truncate(len);
     }
+
+    #[inline]
+    pub(crate) fn extend_from_slice(&mut self, other: &[u8]) {
+        self.inner.extend_from_slice(other);
+    }
 }
 
 impl Slice {