nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 02:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace a bool with a Result<(), ErrorGuaranteed>

Browse Source
This commit is contained in:
Oli Scherer 2024-06-12 15:19:57 +00:00
parent e8d6170b8a
commit 7566307edc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_hir_typeck/src/pat.rs
View File

@ -1256,7 +1256,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
subpats, subpats,
&variant.fields.raw, &variant.fields.raw,
expected, expected,
had_err.is_err(), had_err,
); );
on_error(e); on_error(e);
return Ty::new_error(tcx, e); return Ty::new_error(tcx, e);
@ -1272,7 +1272,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
subpats: &'tcx [Pat<'tcx>], subpats: &'tcx [Pat<'tcx>],
fields: &'tcx [ty::FieldDef], fields: &'tcx [ty::FieldDef],
expected: Ty<'tcx>, expected: Ty<'tcx>,
had_err: bool, had_err: Result<(), ErrorGuaranteed>,
) -> ErrorGuaranteed { ) -> ErrorGuaranteed {
let subpats_ending = pluralize!(subpats.len()); let subpats_ending = pluralize!(subpats.len());
let fields_ending = pluralize!(fields.len()); let fields_ending = pluralize!(fields.len());
@ -1329,7 +1329,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// #67037: only do this if we could successfully type-check the expected type against // #67037: only do this if we could successfully type-check the expected type against
// the tuple struct pattern. Otherwise the args could get out of range on e.g., // the tuple struct pattern. Otherwise the args could get out of range on e.g.,
// `let P() = U;` where `P != U` with `struct P<T>(T);`. // `let P() = U;` where `P != U` with `struct P<T>(T);`.
(ty::Adt(_, args), [field], false) => { (ty::Adt(_, args), [field], Ok(())) => {
let field_ty = self.field_ty(pat_span, field, args); let field_ty = self.field_ty(pat_span, field, args);
match field_ty.kind() { match field_ty.kind() {
ty::Tuple(fields) => fields.len() == subpats.len(), ty::Tuple(fields) => fields.len() == subpats.len(),