From dd5703d619351aa8c3cb122c8f23dfec7ac21370 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Tue, 28 Jan 2025 22:25:23 +0000
Subject: [PATCH 1/2] Use `public-dependencies` in all sysroot crates

In [1], most dependencies of `std` and other sysroot crates were marked
private, but this did not happen for `alloc` and `test`. Update these
here, marking public standard library crates as the only non-private
dependencies.

[1]: https://github.com/rust-lang/rust/pull/111076
---
 alloc/Cargo.toml   | 4 +++-
 sysroot/Cargo.toml | 8 +++++---
 test/Cargo.toml    | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/alloc/Cargo.toml b/alloc/Cargo.toml
index c1d7f324f1770..395cff13189de 100644
--- a/alloc/Cargo.toml
+++ b/alloc/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["public-dependency"]
+
 [package]
 name = "alloc"
 version = "0.0.0"
@@ -9,7 +11,7 @@ autobenches = false
 edition = "2021"
 
 [dependencies]
-core = { path = "../core" }
+core = { path = "../core", public = true }
 compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
diff --git a/sysroot/Cargo.toml b/sysroot/Cargo.toml
index aa6c3dc32e2ba..45a9eda445dfb 100644
--- a/sysroot/Cargo.toml
+++ b/sysroot/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["public-dependency"]
+
 [package]
 name = "sysroot"
 version = "0.0.0"
@@ -5,10 +7,10 @@ edition = "2021"
 
 # this is a dummy crate to ensure that all required crates appear in the sysroot
 [dependencies]
-proc_macro = { path = "../proc_macro" }
+proc_macro = { path = "../proc_macro", public = true }
 profiler_builtins = { path = "../profiler_builtins", optional = true }
-std = { path = "../std" }
-test = { path = "../test" }
+std = { path = "../std", public = true }
+test = { path = "../test", public = true }
 
 # Forward features to the `std` crate as necessary
 [features]
diff --git a/test/Cargo.toml b/test/Cargo.toml
index 75cc7c00e389c..241ef324b0088 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["public-dependency"]
+
 [package]
 name = "test"
 version = "0.0.0"
@@ -5,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 getopts = { version = "0.2.21", features = ['rustc-dep-of-std'] }
-std = { path = "../std" }
-core = { path = "../core" }
+std = { path = "../std", public = true }
+core = { path = "../core", public = true }
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
 libc = { version = "0.2.150", default-features = false }

From 45635480085eafa61e1a974e705392211a1e343e Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Thu, 30 Jan 2025 02:52:39 +0000
Subject: [PATCH 2/2] Replace some instances of `pub` with `pub(crate)`

The recent fixes to private dependencies exposed some cases in the UEFI
module where private dependencies are exposed in a public interface.
These do not need to be crate-public, so change them to `pub(crate)`.
---
 std/src/sys/pal/uefi/process.rs | 2 +-
 std/src/sys/pal/uefi/time.rs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/std/src/sys/pal/uefi/process.rs b/std/src/sys/pal/uefi/process.rs
index 9efe9a314f2e9..c73a6350357a4 100644
--- a/std/src/sys/pal/uefi/process.rs
+++ b/std/src/sys/pal/uefi/process.rs
@@ -388,7 +388,7 @@ mod uefi_command_internal {
             }
         }
 
-        pub fn start_image(&mut self) -> io::Result<r_efi::efi::Status> {
+        pub(crate) fn start_image(&mut self) -> io::Result<r_efi::efi::Status> {
             self.update_st_crc32()?;
 
             // Use our system table instead of the default one
diff --git a/std/src/sys/pal/uefi/time.rs b/std/src/sys/pal/uefi/time.rs
index 495ff2dc930ed..c4ff3015ac60d 100644
--- a/std/src/sys/pal/uefi/time.rs
+++ b/std/src/sys/pal/uefi/time.rs
@@ -84,7 +84,7 @@ pub(crate) mod system_time_internal {
 
     // This algorithm is based on the one described in the post
     // https://blog.reverberate.org/2020/05/12/optimizing-date-algorithms.html
-    pub const fn uefi_time_to_duration(t: r_efi::system::Time) -> Duration {
+    pub(crate) const fn uefi_time_to_duration(t: r_efi::system::Time) -> Duration {
         assert!(t.month <= 12);
         assert!(t.month != 0);