diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-01-18 20:56:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 20:56:20 +0100 |
| commit | fa52edaa51b0f3651a5f8abf8c2d2bb6d0bf587d (patch) | |
| tree | 7ce053aef416fa54394ff0d2e2f124e7e33370b6 /compiler/rustc_monomorphize/src | |
| parent | c0da80f41891f38a517978ed4369dba66cb61abf (diff) | |
| parent | 18e66432c40e8c136b5d0fab27137fdabd579ae0 (diff) | |
| download | rust-fa52edaa51b0f3651a5f8abf8c2d2bb6d0bf587d.tar.gz rust-fa52edaa51b0f3651a5f8abf8c2d2bb6d0bf587d.zip | |
Rollup merge of #119869 - oli-obk:track_errors2, r=matthewjasper
replace `track_errors` usages with bubbling up `ErrorGuaranteed` more of the same as https://github.com/rust-lang/rust/pull/117449 (removing `track_errors`)
Diffstat (limited to 'compiler/rustc_monomorphize/src')
| -rw-r--r-- | compiler/rustc_monomorphize/src/collector.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_monomorphize/src/collector.rs b/compiler/rustc_monomorphize/src/collector.rs index 070580860c1..20e70f87b75 100644 --- a/compiler/rustc_monomorphize/src/collector.rs +++ b/compiler/rustc_monomorphize/src/collector.rs @@ -1433,7 +1433,7 @@ fn collect_alloc<'tcx>(tcx: TyCtxt<'tcx>, alloc_id: AllocId, output: &mut MonoIt } fn assoc_fn_of_type<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId, fn_ident: Ident) -> Option<DefId> { - for impl_def_id in tcx.inherent_impls(def_id) { + for impl_def_id in tcx.inherent_impls(def_id).ok()? { if let Some(new) = tcx.associated_items(impl_def_id).find_by_name_and_kind( tcx, fn_ident, |