diff options
| author | bors <bors@rust-lang.org> | 2024-08-26 22:56:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-26 22:56:04 +0000 |
| commit | bf662eb80838008acabc307dd64d84935ce3a20d (patch) | |
| tree | 006b9ca64ea7386554102510b11aeae3a707984b /compiler/rustc_codegen_ssa/src/back | |
| parent | 515395af0efdbdd657ff08a1f6d28e553856654f (diff) | |
| parent | b3b6baf8336c4a016580bdf6e210ec1925c738ad (diff) | |
| download | rust-bf662eb80838008acabc307dd64d84935ce3a20d.tar.gz rust-bf662eb80838008acabc307dd64d84935ce3a20d.zip | |
Auto merge of #129632 - matthiaskrgr:rollup-8055gq6, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #126013 (Add `#[warn(unreachable_pub)]` to a bunch of compiler crates) - #128157 (deduplicate and clarify rules for converting pointers to references) - #129032 (Document & implement the transmutation modeled by `BikeshedIntrinsicFrom`) - #129250 (Do not ICE on non-ADT rcvr type when looking for crate version collision) - #129340 (Remove Duplicate E0381 Label) - #129560 ([rustdoc] Generate source link on impl associated types) - #129622 (Remove a couple of unused feature enables) - #129625 (Rename `ParenthesizedGenericArgs` to `GenericArgsMode`) - #129626 (Remove `ParamMode::ExplicitNamed`) Failed merges: - #128166 (Improved `checked_isqrt` and `isqrt` methods) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 7bad9d33e7d..8d271f61a9c 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1207,7 +1207,7 @@ mod win { /// Get the Windows system OEM code page. This is most notably the code page /// used for link.exe's output. - pub fn oem_code_page() -> u32 { + pub(super) fn oem_code_page() -> u32 { unsafe { let mut cp: u32 = 0; // We're using the `LOCALE_RETURN_NUMBER` flag to return a u32. @@ -1230,7 +1230,7 @@ mod win { /// /// It will fail if the multi-byte string is longer than `i32::MAX` or if it contains /// any invalid bytes for the expected encoding. - pub fn locale_byte_str_to_string(s: &[u8], code_page: u32) -> Option<String> { + pub(super) fn locale_byte_str_to_string(s: &[u8], code_page: u32) -> Option<String> { // `MultiByteToWideChar` requires a length to be a "positive integer". if s.len() > isize::MAX as usize { return None; diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index 70b45a852ca..7ad31802454 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -754,7 +754,7 @@ pub(crate) enum WorkItem<B: WriteBackendMethods> { } impl<B: WriteBackendMethods> WorkItem<B> { - pub fn module_kind(&self) -> ModuleKind { + fn module_kind(&self) -> ModuleKind { match *self { WorkItem::Optimize(ref m) => m.kind, WorkItem::CopyPostLtoArtifacts(_) | WorkItem::LTO(_) => ModuleKind::Regular, |
