bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #138956 - jhpratt:rollup-6g7ppwd, r=jhpratt

Browse source 
Rollup of 11 pull requests

Successful merges:

 - #138128 (Stabilize `#![feature(precise_capturing_in_traits)]`)
 - #138834 (Group test diffs by stage in post-merge analysis)
 - #138867 (linker: Fix staticlib naming for UEFI)
 - #138874 (Batch mark waiters as unblocked when resuming in the deadlock handler)
 - #138875 (Trusty: Fix build for anonymous pipes and std::sys::process)
 - #138877 (Ignore doctests only in specified targets)
 - #138885 (Fix ui pattern_types test for big-endian platforms)
 - #138905 (Add target maintainer information for powerpc64-unknown-linux-musl)
 - #138911 (Allow defining opaques in statics and consts)
 - #138917 (rustdoc: remove useless `Symbol::is_empty` checks.)
 - #138945 (Override PartialOrd methods for bool)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2025-03-26 03:21:26 +00:00
commit 6e8abb5ec6
66 changed files with 629 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_session/src/output.rs
View file

@ -103,7 +103,7 @@ pub fn filename_for_input(
OutFileName::Real(outputs.out_directory.join(&format!("{prefix}{libname}{suffix}")))
}
CrateType::Staticlib => {
let (prefix, suffix) = (&sess.target.staticlib_prefix, &sess.target.staticlib_suffix);
let (prefix, suffix) = sess.staticlib_components(false);
OutFileName::Real(outputs.out_directory.join(&format!("{prefix}{libname}{suffix}")))
}
CrateType::Executable => {

8
compiler/rustc_session/src/session.rs
View file

@ -586,6 +586,14 @@ impl Session {
.or(self.target.options.default_visibility)
.unwrap_or(SymbolVisibility::Interposable)
}
pub fn staticlib_components(&self, verbatim: bool) -> (&str, &str) {
if verbatim {
("", "")
} else {
(&*self.target.staticlib_prefix, &*self.target.staticlib_suffix)
}
}
}
// JUSTIFICATION: defn of the suggested wrapper fns