Fixes from PR

1. Fix CI: Fixed line number errors in output.
2. Remove unnecessary features
3. Fix uninteded downgrades on rebase in `Cargo.lock`
4. Use stack allocation for TCP4 transmit/receive
5. Remove unused files:
  a. library/std/src/sys/uefi/net/tcp6.rs
  b. library/std/src/sys_common/ucs2.rs
6. Fix Cargo.lock: Rollback unintentional upgrades.
7. Use UTF-16 for UEFI: Use Windows wtf8 implementation for UEFI. This was
   discussed in the PR and does not seem to cause any regressions. In face, it
   fixes some of the tests that were failing earlier.
8. Use Windows `std::os::ffi` for UEFI
9. Use Windows `std::sys::os_str` for UEFI

Signed-off-by: Ayush Singh <[email protected]>

Author: Ayush1325

Cargo.lock

@@ -1879,13 +1879,13 @@ dependencies = [
 
 [[package]]
 name = "im-rc"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca8957e71f04a205cb162508f9326aea04676c8dfd0711220190d6b83664f3f"
+checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe"
 dependencies = [
  "bitmaps",
- "rand_core 0.5.1",
- "rand_xoshiro 0.4.0",
+ "rand_core 0.6.2",
+ "rand_xoshiro",
  "sized-chunks",
  "typenum",
  "version_check",
@@ -2791,9 +2791,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -3033,15 +3033,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_xoshiro"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_xoshiro"
 version = "0.6.0"
@@ -3096,9 +3087,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3125,9 +3116,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
 
 [[package]]
 name = "remote-test-client"
@@ -4829,9 +4820,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
 
 [[package]]
 name = "snap"

library/std/src/lib.rs

@@ -243,18 +243,15 @@
 #![feature(c_unwind)]
 #![feature(cfg_target_thread_local)]
 #![feature(concat_idents)]
-#![feature(const_deref)]
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
-#![feature(const_try)]
 #![feature(decl_macro)]
 #![feature(deprecated_suggestion)]
 #![feature(doc_cfg)]
 #![feature(doc_cfg_hide)]
 #![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)]
@@ -282,7 +279,6 @@
 #![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)]
@@ -311,7 +307,6 @@
 #![feature(prelude_2024)]
 #![feature(provide_any)]
 #![feature(ptr_as_uninit)]
-#![feature(ptr_internals)]
 #![feature(raw_os_nonzero)]
 #![feature(slice_internals)]
 #![feature(slice_ptr_get)]
@@ -326,7 +321,6 @@
 #![feature(alloc_layout_extra)]
 #![feature(allocator_api)]
 #![feature(get_mut_unchecked)]
-#![feature(const_alloc_error)]
 #![feature(map_try_insert)]
 #![feature(new_uninit)]
 #![feature(thin_box)]

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

@@ -3,4 +3,5 @@
 #![unstable(feature = "uefi_std", issue = "100499")]
 
 pub mod env;
+#[path = "../windows/ffi.rs"]
 pub mod ffi;

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

@@ -479,15 +479,8 @@ pub(crate) fn get_runtime_services() -> Option<NonNull<r_efi::efi::RuntimeServic
 
 // Create UCS-2 Vector from OsStr
 pub(crate) fn to_ffi_string(s: &OsStr) -> Vec<u16> {
-    let mut v: Vec<u16> = s
-        .encode_wide()
-        .map(|x| match x {
-            Ok(c) => c,
-            Err(_) => u16::from(crate::sys_common::ucs2::Ucs2Char::REPLACEMENT_CHARACTER),
-        })
-        .collect();
+    let mut v: Vec<u16> = s.encode_wide().collect();
     v.push(0);
-    v.shrink_to_fit();
     v
 }
 

library/std/src/sys/uefi/common.rs

@@ -24,6 +24,7 @@ pub mod io;
 pub mod locks;
 pub mod net;
 pub mod os;
+#[path = "../windows/os_str.rs"]
 pub mod os_str;
 pub mod path;
 pub mod pipe;

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

@@ -1,7 +1,6 @@
 mod implementation;
 mod tcp;
 mod tcp4;
-mod tcp6;
 
 pub use implementation::*;
 

library/std/src/sys/uefi/net/mod.rs

@@ -123,30 +123,17 @@ impl Tcp4Protocol {
             fragment_buffer: buf.as_ptr() as *mut crate::ffi::c_void,
         };
 
-        let layout = unsafe {
-            crate::alloc::Layout::from_size_align_unchecked(
-                crate::mem::size_of::<tcp4::TransmitData>()
-                    + crate::mem::size_of::<tcp4::FragmentData>(),
-                POOL_ALIGNMENT,
-            )
+        let mut transmit_data = TransmitData {
+            push: r_efi::efi::Boolean::TRUE,
+            urgent: r_efi::efi::Boolean::FALSE,
+            data_length: buf_size,
+            fragment_count: 1,
+            fragment_table: [fragment_table; 1],
         };
-        let mut transmit_data = VariableBox::<tcp4::TransmitData>::new_uninit(layout);
 
-        // Initialize TransmitData
-        unsafe {
-            addr_of_mut!((*transmit_data.as_uninit_mut_ptr()).push)
-                .write(r_efi::efi::Boolean::TRUE);
-            addr_of_mut!((*transmit_data.as_uninit_mut_ptr()).urgent)
-                .write(r_efi::efi::Boolean::FALSE);
-            addr_of_mut!((*transmit_data.as_uninit_mut_ptr()).data_length).write(buf_size);
-            addr_of_mut!((*transmit_data.as_uninit_mut_ptr()).fragment_count).write(1);
-            addr_of_mut!((*transmit_data.as_uninit_mut_ptr()).fragment_table)
-                .cast::<tcp4::FragmentData>()
-                .copy_from_nonoverlapping([fragment_table].as_ptr(), 1);
+        let packet = tcp4::IoTokenPacket {
+            tx_data: &mut transmit_data as *mut TransmitData<1> as *mut tcp4::TransmitData,
         };
-        let mut transmit_data = unsafe { transmit_data.assume_init() };
-
-        let packet = tcp4::IoTokenPacket { tx_data: transmit_data.as_mut_ptr() };
         let mut transmit_token = tcp4::IoToken { completion_token, packet };
         unsafe { Self::transmit_raw(self.protocol.as_ptr(), &mut transmit_token) }?;
 
@@ -185,7 +172,7 @@ impl Tcp4Protocol {
                 POOL_ALIGNMENT,
             )
         };
-        let mut transmit_data = VariableBox::<tcp4::TransmitData>::new_uninit(layout);
+        let mut transmit_data = VariableBox::<TransmitData<0>>::new_uninit(layout);
         let fragment_tables_len = fragment_tables.len();
 
         // Initialize TransmitData
@@ -203,7 +190,7 @@ impl Tcp4Protocol {
         };
         let mut transmit_data = unsafe { transmit_data.assume_init() };
 
-        let packet = tcp4::IoTokenPacket { tx_data: transmit_data.as_mut_ptr() };
+        let packet = tcp4::IoTokenPacket { tx_data: transmit_data.as_mut_ptr().cast() };
         let mut transmit_token = tcp4::IoToken { completion_token, packet };
         unsafe { Self::transmit_raw(self.protocol.as_ptr(), &mut transmit_token) }?;
 
@@ -230,26 +217,16 @@ impl Tcp4Protocol {
             fragment_buffer: buf.as_mut_ptr().cast(),
         };
 
-        let layout = unsafe {
-            crate::alloc::Layout::from_size_align_unchecked(
-                crate::mem::size_of::<tcp4::ReceiveData>()
-                    + crate::mem::size_of::<tcp4::FragmentData>(),
-                POOL_ALIGNMENT,
-            )
+        let mut receive_data = ReceiveData {
+            urgent_flag: r_efi::efi::Boolean::FALSE,
+            data_length: buf_size,
+            fragment_count: 1,
+            fragment_table: [fragment_table; 1],
         };
-        let mut receive_data = VariableBox::<tcp4::ReceiveData>::new_uninit(layout);
-        unsafe {
-            addr_of_mut!((*receive_data.as_uninit_mut_ptr()).urgent_flag)
-                .write(r_efi::efi::Boolean::FALSE);
-            addr_of_mut!((*receive_data.as_uninit_mut_ptr()).data_length).write(buf_size);
-            addr_of_mut!((*receive_data.as_uninit_mut_ptr()).fragment_count).write(1);
-            addr_of_mut!((*receive_data.as_uninit_mut_ptr()).fragment_table)
-                .cast::<tcp4::FragmentData>()
-                .copy_from_nonoverlapping([fragment_table].as_ptr(), 1);
-        }
-        let mut receive_data = unsafe { receive_data.assume_init() };
 
-        let packet = tcp4::IoTokenPacket { rx_data: receive_data.as_mut_ptr() };
+        let packet = tcp4::IoTokenPacket {
+            rx_data: &mut receive_data as *mut ReceiveData<1> as *mut tcp4::ReceiveData,
+        };
         let completion_token =
             tcp4::CompletionToken { event: receive_event.as_raw_event(), status: Status::ABORTED };
         let mut receive_token = tcp4::IoToken { completion_token, packet };
@@ -290,7 +267,7 @@ impl Tcp4Protocol {
                 POOL_ALIGNMENT,
             )
         };
-        let mut receive_data = VariableBox::<tcp4::ReceiveData>::new_uninit(layout);
+        let mut receive_data = VariableBox::<ReceiveData<0>>::new_uninit(layout);
         unsafe {
             addr_of_mut!((*receive_data.as_uninit_mut_ptr()).urgent_flag)
                 .write(r_efi::efi::Boolean::FALSE);
@@ -303,7 +280,7 @@ impl Tcp4Protocol {
         }
         let mut receive_data = unsafe { receive_data.assume_init() };
 
-        let packet = tcp4::IoTokenPacket { rx_data: receive_data.as_mut_ptr() };
+        let packet = tcp4::IoTokenPacket { rx_data: receive_data.as_mut_ptr().cast() };
         let completion_token =
             tcp4::CompletionToken { event: receive_event.as_raw_event(), status: Status::ABORTED };
         let mut receive_token = tcp4::IoToken { completion_token, packet };
@@ -473,3 +450,22 @@ unsafe impl Send for Tcp4Protocol {}
 
 // Safety: There are no threads in UEFI
 unsafe impl Sync for Tcp4Protocol {}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct TransmitData<const N: usize> {
+    pub push: r_efi::efi::Boolean,
+    pub urgent: r_efi::efi::Boolean,
+    pub data_length: u32,
+    pub fragment_count: u32,
+    pub fragment_table: [tcp4::FragmentData; N],
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct ReceiveData<const N: usize> {
+    pub urgent_flag: r_efi::efi::Boolean,
+    pub data_length: u32,
+    pub fragment_count: u32,
+    pub fragment_table: [tcp4::FragmentData; N],
+}