diff options
| author | Deadbeef <ent3rm4n@gmail.com> | 2022-08-22 11:41:38 +0000 |
|---|---|---|
| committer | Deadbeef <ent3rm4n@gmail.com> | 2022-08-22 11:44:04 +0000 |
| commit | f1db3be9cf9a7efff0db8195e245dcfea16cb233 (patch) | |
| tree | df9746314c2a13671f19a7b7d805bf3949bd6989 | |
| parent | f019b6c5e8f2bb7e5985ea595b0946479c5aa4c2 (diff) | |
| download | rust-f1db3be9cf9a7efff0db8195e245dcfea16cb233.tar.gz rust-f1db3be9cf9a7efff0db8195e245dcfea16cb233.zip | |
fix tidy
| -rw-r--r-- | compiler/rustc_typeck/src/check/wfcheck.rs | 26 | ||||
| -rw-r--r-- | src/test/ui/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 9e39abe9aa5..9e39e49b63c 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., `<T, U = T>`). 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 2db5595a5ae..1004bb28c59 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: <Self as Index>::Output = (); type Assoc = <Self as Index>::Output; - fn foo(&mut self, x: <Self as Index>::Output) -> <Self as Index>::Output where <Self as Index>::Output: {} + fn foo(&mut self, x: <Self as Index>::Output) -> <Self as Index>::Output + where <Self as Index>::Output:, + {} } const C: <() as Index>::Output = (); |
