run clippy_dev fmt

This seemed to overdo it a bit, affecting multiple submodules, and changing a file I didn't touch, so I didn't commit those changes
This commit is contained in:
Ryan1729 2020-08-06 06:15:57 -06:00
parent 0d2a378547
commit 42f3d39a54

View file

@ -8,8 +8,8 @@ use rustc_errors::Applicability;
use rustc_hir::{Expr, ExprKind, GenericArg, Mutability, QPath, TyKind, UnOp}; use rustc_hir::{Expr, ExprKind, GenericArg, Mutability, QPath, TyKind, UnOp};
use rustc_lint::{LateContext, LateLintPass}; use rustc_lint::{LateContext, LateLintPass};
use rustc_middle::ty::{self, cast::CastKind, Ty}; use rustc_middle::ty::{self, cast::CastKind, Ty};
use rustc_span::DUMMY_SP;
use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::DUMMY_SP;
use rustc_typeck::check::{cast::CastCheck, FnCtxt, Inherited}; use rustc_typeck::check::{cast::CastCheck, FnCtxt, Inherited};
use std::borrow::Cow; use std::borrow::Cow;
@ -698,18 +698,16 @@ fn is_layout_incompatible<'tcx>(cx: &LateContext<'tcx>, from: Ty<'tcx>, to: Ty<'
/// a transmute. In certain cases, including some invalid casts from array /// a transmute. In certain cases, including some invalid casts from array
/// references to pointers, this may cause additional errors to be emitted and/or /// references to pointers, this may cause additional errors to be emitted and/or
/// ICE error messages. This function will panic if that occurs. /// ICE error messages. This function will panic if that occurs.
fn can_be_expressed_as_pointer_cast<'tcx>(cx: &LateContext<'tcx>, e: &'tcx Expr<'_>, from_ty: Ty<'tcx>, to_ty: Ty<'tcx>) -> bool { fn can_be_expressed_as_pointer_cast<'tcx>(
cx: &LateContext<'tcx>,
e: &'tcx Expr<'_>,
from_ty: Ty<'tcx>,
to_ty: Ty<'tcx>,
) -> bool {
use CastKind::*; use CastKind::*;
matches!( matches!(
check_cast(cx, e, from_ty, to_ty), check_cast(cx, e, from_ty, to_ty),
Some( Some(PtrPtrCast | PtrAddrCast | AddrPtrCast | ArrayPtrCast | FnPtrPtrCast | FnPtrAddrCast)
PtrPtrCast
| PtrAddrCast
| AddrPtrCast
| ArrayPtrCast
| FnPtrPtrCast
| FnPtrAddrCast
)
) )
} }
@ -722,26 +720,18 @@ fn check_cast<'tcx>(cx: &LateContext<'tcx>, e: &'tcx Expr<'_>, from_ty: Ty<'tcx>
let local_def_id = hir_id.owner; let local_def_id = hir_id.owner;
Inherited::build(cx.tcx, local_def_id).enter(|inherited| { Inherited::build(cx.tcx, local_def_id).enter(|inherited| {
let fn_ctxt = FnCtxt::new( let fn_ctxt = FnCtxt::new(&inherited, cx.param_env, hir_id);
&inherited,
cx.param_env,
hir_id
);
// If we already have errors, we can't be sure we can pointer cast. // If we already have errors, we can't be sure we can pointer cast.
assert!( assert!(
!fn_ctxt.errors_reported_since_creation(), !fn_ctxt.errors_reported_since_creation(),
"Newly created FnCtxt contained errors" "Newly created FnCtxt contained errors"
); );
if let Ok(check) = CastCheck::new( if let Ok(check) = CastCheck::new(
&fn_ctxt, &fn_ctxt, e, from_ty, to_ty,
e,
from_ty,
to_ty,
// We won't show any error to the user, so we don't care what the span is here. // We won't show any error to the user, so we don't care what the span is here.
DUMMY_SP, DUMMY_SP, DUMMY_SP,
DUMMY_SP,
) { ) {
let res = check.do_check(&fn_ctxt); let res = check.do_check(&fn_ctxt);