bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #132171 - matthiaskrgr:rollup-tp75ge7, r=matthiaskrgr

Browse source 
Rollup of 3 pull requests

Successful merges:

 - #132114 (Use `Enabled{Lang,Lib}Feature`  instead of n-tuples)
 - #132163 (Update Fuchsia CI script for package serving)
 - #132168 (Effects cleanup)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-10-26 06:53:53 +00:00
commit 80d0d927d5
31 changed files with 163 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_monomorphize/src/collector.rs
View file

@ -504,7 +504,7 @@ fn collect_items_rec<'tcx>(
// Check for PMEs and emit a diagnostic if one happened. To try to show relevant edges of the
// mono item graph.
if tcx.dcx().err_count() > error_count
&& starting_item.node.is_generic_fn(tcx)
&& starting_item.node.is_generic_fn()
&& starting_item.node.is_user_defined()
{
let formatted_item = with_no_trimmed_paths!(starting_item.node.to_string());

4
compiler/rustc_monomorphize/src/partitioning.rs
View file

@ -229,7 +229,7 @@ where
}
let characteristic_def_id = characteristic_def_id_of_mono_item(cx.tcx, mono_item);
let is_volatile = is_incremental_build && mono_item.is_generic_fn(cx.tcx);
let is_volatile = is_incremental_build && mono_item.is_generic_fn();
let cgu_name = match characteristic_def_id {
Some(def_id) => compute_codegen_unit_name(
@ -822,7 +822,7 @@ fn mono_item_visibility<'tcx>(
return Visibility::Hidden;
}
let is_generic = instance.args.non_erasable_generics(tcx, def_id).next().is_some();
let is_generic = instance.args.non_erasable_generics().next().is_some();
// Upstream `DefId` instances get different handling than local ones.
let Some(def_id) = def_id.as_local() else {