Skip to content

Commit ed172db

Browse files
committedMay 23, 2024
Auto merge of rust-lang#125448 - matthiaskrgr:rollup-vn6nleh, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#124297 (Allow coercing functions whose signature differs in opaque types in their defining scope into a shared function pointer type) - rust-lang#124516 (Allow monomorphization time const eval failures if the cause is a type layout issue) - rust-lang#124976 (rustc: Use `tcx.used_crates(())` more) - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 39d2f2a + cf92f4c commit ed172db

File tree

70 files changed

+404
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+404
-155
lines changed
 

‎compiler/rustc_codegen_ssa/src/back/link.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -786,12 +786,12 @@ fn link_natively(
786786
if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
787787
&& unknown_arg_regex.is_match(&out)
788788
&& out.contains("-no-pie")
789-
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
789+
&& cmd.get_args().iter().any(|e| e == "-no-pie")
790790
{
791791
info!("linker output: {:?}", out);
792792
warn!("Linker does not support -no-pie command line option. Retrying without.");
793793
for arg in cmd.take_args() {
794-
if arg.to_string_lossy() != "-no-pie" {
794+
if arg != "-no-pie" {
795795
cmd.arg(arg);
796796
}
797797
}
@@ -825,7 +825,7 @@ fn link_natively(
825825
if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
826826
&& unknown_arg_regex.is_match(&out)
827827
&& (out.contains("-static-pie") || out.contains("--no-dynamic-linker"))
828-
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
828+
&& cmd.get_args().iter().any(|e| e == "-static-pie")
829829
{
830830
info!("linker output: {:?}", out);
831831
warn!(
@@ -864,7 +864,7 @@ fn link_natively(
864864
assert!(pre_objects_static.is_empty() || !pre_objects_static_pie.is_empty());
865865
assert!(post_objects_static.is_empty() || !post_objects_static_pie.is_empty());
866866
for arg in cmd.take_args() {
867-
if arg.to_string_lossy() == "-static-pie" {
867+
if arg == "-static-pie" {
868868
// Replace the output kind.
869869
cmd.arg("-static");
870870
} else if pre_objects_static_pie.contains(&arg) {

‎compiler/rustc_codegen_ssa/src/back/symbol_export.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ fn upstream_monomorphizations_provider(
399399
tcx: TyCtxt<'_>,
400400
(): (),
401401
) -> DefIdMap<UnordMap<GenericArgsRef<'_>, CrateNum>> {
402-
let cnums = tcx.crates(());
402+
let cnums = tcx.used_crates(());
403403

404404
let mut instances: DefIdMap<UnordMap<_, _>> = Default::default();
405405

0 commit comments

Comments
 (0)