From f1db3be9cf9a7efff0db8195e245dcfea16cb233 Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Mon, 22 Aug 2022 11:41:38 +0000 Subject: [PATCH] fix tidy --- compiler/rustc_typeck/src/check/wfcheck.rs | 26 +++++++------------ .../rfc-2632-const-trait-impl/issue-100222.rs | 4 ++- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/compiler/rustc_typeck/src/check/wfcheck.rs b/compiler/rustc_typeck/src/check/wfcheck.rs index 9e39abe9aa55b..9e39e49b63c20 100644 --- a/compiler/rustc_typeck/src/check/wfcheck.rs +++ b/compiler/rustc_typeck/src/check/wfcheck.rs @@ -1193,11 +1193,7 @@ fn check_item_type(tcx: TyCtxt<'_>, item_id: LocalDefId, ty_span: Span, allow_fo } } - wfcx.register_wf_obligation( - ty_span, - Some(WellFormedLoc::Ty(item_id)), - item_ty.into(), - ); + wfcx.register_wf_obligation(ty_span, Some(WellFormedLoc::Ty(item_id)), item_ty.into()); if forbid_unsized { wfcx.register_bound( traits::ObligationCause::new(ty_span, wfcx.body_id, traits::WellFormed(None)), @@ -1306,11 +1302,7 @@ fn check_where_clauses<'tcx>(wfcx: &WfCheckingCtxt<'_, 'tcx>, span: Span, def_id // parameter includes another (e.g., ``). In those cases, we can't // be sure if it will error or not as user might always specify the other. if !ty.needs_subst() { - wfcx.register_wf_obligation( - tcx.def_span(param.def_id), - None, - ty.into(), - ); + wfcx.register_wf_obligation(tcx.def_span(param.def_id), None, ty.into()); } } } @@ -1454,7 +1446,13 @@ fn check_where_clauses<'tcx>(wfcx: &WfCheckingCtxt<'_, 'tcx>, span: Span, def_id assert_eq!(predicates.predicates.len(), predicates.spans.len()); let wf_obligations = iter::zip(&predicates.predicates, &predicates.spans).flat_map(|(&p, &sp)| { - traits::wf::predicate_obligations(infcx, wfcx.param_env.without_const(), wfcx.body_id, p, sp) + traits::wf::predicate_obligations( + infcx, + wfcx.param_env.without_const(), + wfcx.body_id, + p, + sp, + ) }); let obligations: Vec<_> = wf_obligations.chain(default_obligations).collect(); @@ -1509,11 +1507,7 @@ fn check_fn_or_method<'tcx>( ); } - wfcx.register_wf_obligation( - hir_decl.output.span(), - None, - sig.output().into(), - ); + wfcx.register_wf_obligation(hir_decl.output.span(), None, sig.output().into()); check_where_clauses(wfcx, span, def_id); } diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs b/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs index 2db5595a5aed2..1004bb28c59e7 100644 --- a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs +++ b/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs @@ -19,7 +19,9 @@ impl Index for () { type Output = (); } impl const IndexMut for <() as Index>::Output { const C: ::Output = (); type Assoc = ::Output; - fn foo(&mut self, x: ::Output) -> ::Output where ::Output: {} + fn foo(&mut self, x: ::Output) -> ::Output + where ::Output:, + {} } const C: <() as Index>::Output = ();