Skip to content

Commit 06d5f30

Browse files
committed
Fix clippy
1 parent 143570b commit 06d5f30

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/tools/clippy/clippy_lints/src/no_effect.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn has_no_effect(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
239239
!has_drop(cx, cx.typeck_results().expr_ty(expr))
240240
&& fields.iter().all(|field| has_no_effect(cx, field.expr))
241241
&& match &base {
242-
StructTailExpr::None | StructTailExpr::DefaultFields(_) => true,
242+
StructTailExpr::None(_)| StructTailExpr::DefaultFields(_) => true,
243243
StructTailExpr::Base(base) => has_no_effect(cx, base),
244244
}
245245
},
@@ -347,7 +347,7 @@ fn reduce_expression<'a>(cx: &LateContext<'_>, expr: &'a Expr<'a>) -> Option<Vec
347347
} else {
348348
let base = match base {
349349
StructTailExpr::Base(base) => Some(base),
350-
StructTailExpr::None | StructTailExpr::DefaultFields(_) => None,
350+
StructTailExpr::None(_)| StructTailExpr::DefaultFields(_) => None,
351351
};
352352
Some(fields.iter().map(|f| &f.expr).chain(base).map(Deref::deref).collect())
353353
}

src/tools/clippy/clippy_lints/src/unnecessary_struct_initialization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl LateLintPass<'_> for UnnecessaryStruct {
5959
let field_path = same_path_in_all_fields(cx, expr, fields);
6060

6161
let sugg = match (field_path, base) {
62-
(Some(&path), StructTailExpr::None | StructTailExpr::DefaultFields(_)) => {
62+
(Some(&path), StructTailExpr::None(_)| StructTailExpr::DefaultFields(_)) => {
6363
// all fields match, no base given
6464
path.span
6565
},

src/tools/clippy/clippy_lints/src/utils/author.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
600600
bind!(self, qpath, fields);
601601
let base = OptionPat::new(match base {
602602
StructTailExpr::Base(base) => Some(self.bind("base", base)),
603-
StructTailExpr::None | StructTailExpr::DefaultFields(_) => None,
603+
StructTailExpr::None(_) | StructTailExpr::DefaultFields(_) => None,
604604
});
605605
kind!("Struct({qpath}, {fields}, {base})");
606606
self.qpath(qpath);

0 commit comments

Comments
 (0)