Fixes from PR

1. Fix Cargo.lock: Just fixing all the downgrades that heppened during rebase.
2. Add comments suggested in PR
3. Bug fixes

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Author: Ayush1325

Cargo.lock

@@ -927,11 +927,11 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1635,9 +1635,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "globset"
-version = "0.4.5"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
+checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
 dependencies = [
  "aho-corasick",
  "bstr 0.2.17",
@@ -1861,9 +1861,9 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
 
 [[package]]
 name = "ignore"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
+checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
 dependencies = [
  "crossbeam-utils",
  "globset",
@@ -1911,12 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
-dependencies = [
- "unindent",
-]
+checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e"
 
 [[package]]
 name = "installer"
@@ -2539,9 +2536,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
@@ -5564,12 +5561,6 @@ dependencies = [
  "diff",
 ]
 
-[[package]]
-name = "unindent"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
-
 [[package]]
 name = "unstable-book-gen"
 version = "0.1.0"

Cargo.toml

@@ -113,5 +113,3 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
-
-

library/std/src/lib.rs

@@ -234,6 +234,7 @@
 )]
 //
 // Language features:
+#![feature(abi_efiapi)]
 #![feature(alloc_error_handler)]
 #![feature(allocator_internals)]
 #![feature(allow_internal_unsafe)]
@@ -251,6 +252,7 @@
 #![feature(doc_masked)]
 #![feature(doc_notable_trait)]
 #![feature(dropck_eyepatch)]
+#![feature(exclusive_range_pattern)]
 #![feature(exhaustive_patterns)]
 #![feature(if_let_guard)]
 #![feature(intra_doc_pointers)]
@@ -272,15 +274,13 @@
 #![feature(thread_local)]
 #![feature(try_blocks)]
 #![feature(utf8_chunks)]
-#![feature(abi_efiapi)]
-#![feature(exclusive_range_pattern)]
-#![feature(const_option)]
 //
 // Library features (core):
 #![feature(array_error_internals)]
 #![feature(atomic_mut_ptr)]
 #![feature(char_error_internals)]
 #![feature(char_internals)]
+#![feature(const_option)]
 #![feature(core_intrinsics)]
 #![feature(cstr_from_bytes_until_nul)]
 #![feature(cstr_internals)]

library/std/src/os/mod.rs

@@ -147,9 +147,10 @@ pub mod solid;
 pub mod vxworks;
 #[cfg(target_os = "watchos")]
 pub(crate) mod watchos;
-
 #[cfg(target_os = "uefi")]
 pub mod uefi;
+#[cfg(target_os = "vxworks")]
+pub mod vxworks;
 
 #[cfg(any(unix, target_os = "wasi", doc))]
 pub mod fd;

library/std/src/os/uefi/env.rs

@@ -20,37 +20,37 @@ pub(crate) fn init_globals(handle: NonNull<c_void>, system_table: NonNull<System
     GLOBAL_SYSTEM_HANDLE.store(handle.as_ptr(), Ordering::SeqCst);
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
 /// Get the SystemTable Pointer.
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn get_system_table() -> Option<NonNull<SystemTable>> {
     NonNull::new(GLOBAL_SYSTEM_TABLE.load(Ordering::SeqCst))
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
 /// Get the SystemHandle Pointer.
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn get_system_handle() -> Option<NonNull<c_void>> {
     NonNull::new(GLOBAL_SYSTEM_HANDLE.load(Ordering::SeqCst))
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
 /// Get the BootServices Pointer.
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn get_boot_services() -> Option<NonNull<BootServices>> {
     let system_table = get_system_table()?;
     let boot_services = unsafe { (*system_table.as_ptr()).boot_services };
     NonNull::new(boot_services)
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
 /// Get the RuntimeServices Pointer.
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn get_runtime_services() -> Option<NonNull<RuntimeServices>> {
     let system_table = get_system_table()?;
     let runtime_services = unsafe { (*system_table.as_ptr()).runtime_services };
     NonNull::new(runtime_services)
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
 /// Open Protocol on a handle
 /// Implemented using `EFI_BOOT_SERVICES.OpenProtocol()`
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn open_protocol<T>(
     handle: NonNull<c_void>,
     mut protocol_guid: Guid,
@@ -80,9 +80,9 @@ pub fn open_protocol<T>(
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
-// Locate handles with a particula protocol Guid
+// Locate handles with a particular protocol GUID
 /// Implemented using `EFI_BOOT_SERVICES.LocateHandles()`
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub fn locate_handles(mut guid: Guid) -> io::Result<Vec<NonNull<c_void>>> {
     fn inner(
         guid: &mut Guid,
@@ -117,11 +117,14 @@ pub fn locate_handles(mut guid: Guid) -> io::Result<Vec<NonNull<c_void>>> {
         },
     }
 
-    let mut buf: Vec<Handle> = Vec::with_capacity(buf_len);
-
+    // The returned buf_len is in bytes
+    let mut buf: Vec<Handle> = Vec::with_capacity(buf_len / crate::mem::size_of::<Handle>());
     match inner(&mut guid, boot_services, &mut buf_len, buf.as_mut_ptr()) {
         Ok(()) => {
-            unsafe { buf.set_len(buf_len) };
+            // SAFETY: This is safe because the call will succeed only if buf_len >= required
+            // length. Also, on success, the `buf_len` is updated with the size of bufferv (in
+            // bytes) written
+            unsafe { buf.set_len(buf_len / crate::mem::size_of::<Handle>()) };
             Ok(buf.iter().filter_map(|x| NonNull::new(*x)).collect())
         }
         Err(e) => Err(e),

library/std/src/os/uefi/ffi.rs

@@ -2,14 +2,14 @@ use crate::ffi::{OsStr, OsString};
 use crate::sealed::Sealed;
 use crate::sys_common::ucs2;
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub trait OsStrExt: Sealed {
     /// This function does not do any allocation
     fn to_ucs2<'a>(&'a self) -> ucs2::EncodeUcs2<'a>;
 
     /// Creates a UCS-2 Vec which can be passed for FFI.
-    /// Note: The returned string is NULL terminated.
-    /// Note: The supplied should not contain NULL.
+    /// Note: This function will replace `NULL` and other characters which are not valid in UEFI
+    /// strings with `std::sys_common::ucs::Ucs2Char::REPLACEMENT_CHARACTER`
     fn to_ffi_string(&self) -> Vec<u16> {
         let mut v: Vec<u16> = self
             .to_ucs2()
@@ -32,7 +32,7 @@ impl OsStrExt for OsStr {
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 pub trait OsStringExt: Sealed
 where
     Self: Sized,

library/std/src/os/uefi/mod.rs

@@ -1,6 +1,6 @@
 //! Platform-specific extensions to `std` for UEFI.
 
-#![unstable(feature = "uefi_std", issue = "none")]
+#![unstable(feature = "uefi_std", issue = "100499")]
 
 pub mod env;
 pub mod ffi;

library/std/src/os/uefi/net.rs

@@ -1,25 +1,25 @@
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl From<r_efi::efi::Ipv6Address> for crate::net::Ipv6Addr {
     fn from(t: r_efi::efi::Ipv6Address) -> Self {
         Self::from(t.addr)
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl From<&crate::net::Ipv6Addr> for r_efi::efi::Ipv6Address {
     fn from(t: &crate::net::Ipv6Addr) -> Self {
         Self { addr: t.octets() }
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl From<r_efi::efi::Ipv4Address> for crate::net::Ipv4Addr {
     fn from(t: r_efi::efi::Ipv4Address) -> Self {
         Self::from(t.addr)
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl From<&crate::net::Ipv4Addr> for r_efi::efi::Ipv4Address {
     fn from(t: &crate::net::Ipv4Addr) -> Self {
         Self { addr: t.octets() }

library/std/src/os/uefi/path.rs

@@ -7,7 +7,7 @@ use crate::ptr::NonNull;
 use crate::sys_common::{ucs2, AsInner};
 use r_efi::protocols::{device_path, device_path_from_text, device_path_to_text};
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl TryFrom<&DevicePath> for PathBuf {
     type Error = crate::io::Error;
 
@@ -16,7 +16,7 @@ impl TryFrom<&DevicePath> for PathBuf {
     }
 }
 
-#[unstable(feature = "uefi_std", issue = "none")]
+#[unstable(feature = "uefi_std", issue = "100499")]
 impl TryFrom<NonNull<device_path::Protocol>> for PathBuf {
     type Error = crate::io::Error;
 

library/std/src/path.rs

@@ -189,7 +189,7 @@ pub enum Prefix<'a> {
 
     /// UEFI Device Prefix. e.g., `PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0)/CDROM(0x0)`
     /// Sometimes also represented like Windows Disks, but this is more general
-    #[unstable(feature = "uefi_std", issue = "none")]
+    #[unstable(feature = "uefi_std", issue = "100499")]
     UefiDevice(&'a OsStr),
 }