nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-07 15:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting fixes

Browse Source
This commit is contained in:
Tommaso Bianchi 2019-12-16 11:28:28 -05:00
parent 042d8553a1
commit b08d697236
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustc_typeck/check/dropck.rs
View File

@ -56,8 +56,10 @@ pub fn check_drop_impl(tcx: TyCtxt<'_>, drop_impl_did: DefId) -> Result<(), Erro
// already checked by coherence, but compilation may // already checked by coherence, but compilation may
// not have been terminated. // not have been terminated.
let span = tcx.def_span(drop_impl_did); let span = tcx.def_span(drop_impl_did);
tcx.sess.delay_span_bug(span, tcx.sess.delay_span_bug(
&format!("should have been rejected by coherence check: {}", dtor_self_type)); span,
&format!("should have been rejected by coherence check: {}", dtor_self_type),
);
Err(ErrorReported) Err(ErrorReported)
} }
} }
@ -85,10 +87,7 @@ fn ensure_drop_params_and_item_params_correspond<'tcx>(
let fresh_impl_self_ty = drop_impl_ty.subst(tcx, fresh_impl_substs); let fresh_impl_self_ty = drop_impl_ty.subst(tcx, fresh_impl_substs);
let cause = &ObligationCause::misc(drop_impl_span, drop_impl_hir_id); let cause = &ObligationCause::misc(drop_impl_span, drop_impl_hir_id);
match infcx match infcx.at(cause, impl_param_env).eq(named_type, fresh_impl_self_ty) {
.at(cause, impl_param_env)
.eq(named_type, fresh_impl_self_ty)
{
Ok(InferOk { obligations, .. }) => { Ok(InferOk { obligations, .. }) => {
fulfillment_cx.register_predicate_obligations(infcx, obligations); fulfillment_cx.register_predicate_obligations(infcx, obligations);
} }
@ -99,12 +98,13 @@ fn ensure_drop_params_and_item_params_correspond<'tcx>(
drop_impl_span, drop_impl_span,
E0366, E0366,
"Implementations of Drop cannot be specialized" "Implementations of Drop cannot be specialized"
).span_note( )
.span_note(
item_span, item_span,
"Use same sequence of generic type and region \ "Use same sequence of generic type and region \
parameters that is on the struct/enum definition", parameters that is on the struct/enum definition",
) )
.emit(); .emit();
return Err(ErrorReported); return Err(ErrorReported);
} }
} }
@ -245,12 +245,13 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>(
E0367, E0367,
"The requirement `{}` is added only by the Drop impl.", "The requirement `{}` is added only by the Drop impl.",
predicate predicate
).span_note( )
.span_note(
item_span, item_span,
"The same requirement must be part of \ "The same requirement must be part of \
the struct/enum definition", the struct/enum definition",
) )
.emit(); .emit();
result = Err(ErrorReported); result = Err(ErrorReported);
} }
} }