diff options
| author | bors <bors@rust-lang.org> | 2021-11-09 11:16:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-09 11:16:38 +0000 |
| commit | eee8b9c7bafade55981d155dae71657f1cc55a22 (patch) | |
| tree | c080e3bab0af37d20ea68fdb20ce15c2ed3e623b /compiler/rustc_const_eval/src/transform | |
| parent | 214cd1f228a463b59f73ee46c8ae3b30f85de253 (diff) | |
| parent | d863021521c57cec83da08f361ba13a3c3a2483a (diff) | |
| download | rust-eee8b9c7bafade55981d155dae71657f1cc55a22.tar.gz rust-eee8b9c7bafade55981d155dae71657f1cc55a22.zip | |
Auto merge of #90700 - fee1-dead:select-returns-vec, r=davidtwco
Make `select_*` methods return `Vec` for `TraitEngine` This reduces some complexity as an empty vec means no errors and non-empty vec means errors occurred.
Diffstat (limited to 'compiler/rustc_const_eval/src/transform')
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/check_consts/check.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/check.rs b/compiler/rustc_const_eval/src/transform/check_consts/check.rs index 3785c170f6b..61fd828a430 100644 --- a/compiler/rustc_const_eval/src/transform/check_consts/check.rs +++ b/compiler/rustc_const_eval/src/transform/check_consts/check.rs @@ -1054,8 +1054,9 @@ fn check_return_ty_is_sync(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, hir_id: HirId) let mut fulfillment_cx = traits::FulfillmentContext::new(); let sync_def_id = tcx.require_lang_item(LangItem::Sync, Some(body.span)); fulfillment_cx.register_bound(&infcx, ty::ParamEnv::empty(), ty, sync_def_id, cause); - if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) { - infcx.report_fulfillment_errors(&err, None, false); + let errors = fulfillment_cx.select_all_or_error(&infcx); + if !errors.is_empty() { + infcx.report_fulfillment_errors(&errors, None, false); } }); } |
