diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-23 00:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-23 00:16:18 +0100 |
| commit | 1610bfb6af0bbd2d5bf737df89762310cc8cc4d2 (patch) | |
| tree | 08f0bec10587924a35bbbcb16079fc85fa188645 /library/std/src | |
| parent | 46420c96070b4c4bd8242f16d5806b8f26a57016 (diff) | |
| parent | 93925809eb2f4be76c7babcc7cdb73d10ef977bd (diff) | |
| download | rust-1610bfb6af0bbd2d5bf737df89762310cc8cc4d2.tar.gz rust-1610bfb6af0bbd2d5bf737df89762310cc8cc4d2.zip | |
Rollup merge of #135501 - tgross35:stdlib-dependencies-private, r=bjorn3
Inject `compiler_builtins` during postprocessing and ensure it is made private Follow up of https://github.com/rust-lang/rust/pull/135278 Do the following: * Inject `compiler_builtins` during postprocessing, rather than injecting `extern crate compiler_builtins as _` into the AST * Do not make dependencies of `std` private by default (this was added in #135278) * Make sure sysroot crates correctly mark their dependencies private/public * Ensure that marking a dependency private makes its dependents private by default as well, unless otherwise specified * Do the `compiler_builtins` update that has been blocked on this There is more detail in the commit messages. This includes the changes I was working on in https://github.com/rust-lang/rust/pull/136226. try-job: test-various try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: i686-mingw-1 try-job: i686-mingw-2
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/pal/uefi/process.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/uefi/time.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/uefi/process.rs b/library/std/src/sys/pal/uefi/process.rs index 9efe9a314f2..c73a6350357 100644 --- a/library/std/src/sys/pal/uefi/process.rs +++ b/library/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/library/std/src/sys/pal/uefi/time.rs b/library/std/src/sys/pal/uefi/time.rs index 495ff2dc930..c4ff3015ac6 100644 --- a/library/std/src/sys/pal/uefi/time.rs +++ b/library/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); |
