diff options
| author | bors <bors@rust-lang.org> | 2024-10-26 06:53:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-26 06:53:53 +0000 |
| commit | 80d0d927d5069b67cc08c0c65b48e7b6e0cdeeb5 (patch) | |
| tree | 7a785a040625a44584b8a3a3bb6e859cd6eb7e1b /compiler/rustc_monomorphize/src | |
| parent | ae4c6b66402cdbda8daa626216efd94e2dbe94b2 (diff) | |
| parent | 56463df1be31246074c86c21e2174430ad466dbd (diff) | |
| download | rust-80d0d927d5069b67cc08c0c65b48e7b6e0cdeeb5.tar.gz rust-80d0d927d5069b67cc08c0c65b48e7b6e0cdeeb5.zip | |
Auto merge of #132171 - matthiaskrgr:rollup-tp75ge7, r=matthiaskrgr
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
Diffstat (limited to 'compiler/rustc_monomorphize/src')
| -rw-r--r-- | compiler/rustc_monomorphize/src/collector.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_monomorphize/src/partitioning.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_monomorphize/src/collector.rs b/compiler/rustc_monomorphize/src/collector.rs index e5c59d60822..8df6e63deeb 100644 --- a/compiler/rustc_monomorphize/src/collector.rs +++ b/compiler/rustc_monomorphize/src/collector.rs @@ -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()); diff --git a/compiler/rustc_monomorphize/src/partitioning.rs b/compiler/rustc_monomorphize/src/partitioning.rs index 9bf7e67417e..e2a6d392ca0 100644 --- a/compiler/rustc_monomorphize/src/partitioning.rs +++ b/compiler/rustc_monomorphize/src/partitioning.rs @@ -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 { |