Merge remote-tracking branch 'upstream/master' into rustup

2021-04-08 17:18:19 +02:00
parent cde58f7174 db6ea84f87
commit ffa2b7da29
352 changed files with 10428 additions and 6031 deletions
--- a/clippy_lints/src/default_numeric_fallback.rs
+++ b/clippy_lints/src/default_numeric_fallback.rs
@@ -131,8 +131,8 @@ impl<'a, 'tcx> Visitor<'tcx> for NumericFallbackVisitor<'a, 'tcx> {
            },

            ExprKind::Struct(_, fields, base) => {
+                let ty = self.cx.typeck_results().expr_ty(expr);
                if_chain! {
-                    let ty = self.cx.typeck_results().expr_ty(expr);
                    if let Some(adt_def) = ty.ty_adt_def();
                    if adt_def.is_struct();
                    if let Some(variant) = adt_def.variants.iter().next();