Skip to content

Commit 73db83a

Browse files
committed
cleanup check_pat
1 parent 580ac0b commit 73db83a

File tree

1 file changed

+11
-21
lines changed
  • src/librustc_typeck/check

1 file changed

+11
-21
lines changed

src/librustc_typeck/check/pat.rs

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
7272
let is_nrp = self.is_non_ref_pat(pat, path_resolution.map(|(res, ..)| res));
7373
let (expected, def_bm) = self.calc_default_binding_mode(pat, expected, def_bm, is_nrp);
7474

75-
let ty = match &pat.kind {
75+
let ty = match pat.kind {
7676
PatKind::Wild => expected,
7777
PatKind::Lit(lt) => self.check_pat_lit(pat.span, lt, expected, discrim_span),
7878
PatKind::Range(begin, end, _) => {
@@ -82,50 +82,40 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
8282
}
8383
}
8484
PatKind::Binding(ba, var_id, _, sub) => {
85-
let sub = sub.as_deref();
86-
self.check_pat_ident(pat, *ba, *var_id, sub, expected, def_bm, discrim_span)
85+
self.check_pat_ident(pat, ba, var_id, sub, expected, def_bm, discrim_span)
8786
}
88-
PatKind::TupleStruct(qpath, subpats, ddpos) => self.check_pat_tuple_struct(
87+
PatKind::TupleStruct(ref qpath, subpats, ddpos) => self.check_pat_tuple_struct(
8988
pat,
9089
qpath,
9190
subpats,
92-
*ddpos,
91+
ddpos,
9392
expected,
9493
def_bm,
9594
discrim_span,
9695
),
97-
PatKind::Path(qpath) => {
96+
PatKind::Path(ref qpath) => {
9897
self.check_pat_path(pat, path_resolution.unwrap(), qpath, expected)
9998
}
100-
PatKind::Struct(qpath, fields, etc) => {
101-
self.check_pat_struct(pat, qpath, fields, *etc, expected, def_bm, discrim_span)
99+
PatKind::Struct(ref qpath, fields, etc) => {
100+
self.check_pat_struct(pat, qpath, fields, etc, expected, def_bm, discrim_span)
102101
}
103102
PatKind::Or(pats) => {
104-
for pat in *pats {
103+
for pat in pats {
105104
self.check_pat(pat, expected, def_bm, discrim_span);
106105
}
107106
expected
108107
}
109108
PatKind::Tuple(elements, ddpos) => {
110-
self.check_pat_tuple(pat.span, *elements, *ddpos, expected, def_bm, discrim_span)
109+
self.check_pat_tuple(pat.span, elements, ddpos, expected, def_bm, discrim_span)
111110
}
112111
PatKind::Box(inner) => {
113112
self.check_pat_box(pat.span, inner, expected, def_bm, discrim_span)
114113
}
115114
PatKind::Ref(inner, mutbl) => {
116-
self.check_pat_ref(pat, inner, *mutbl, expected, def_bm, discrim_span)
115+
self.check_pat_ref(pat, inner, mutbl, expected, def_bm, discrim_span)
117116
}
118117
PatKind::Slice(before, slice, after) => {
119-
let slice = slice.as_deref();
120-
self.check_pat_slice(
121-
pat.span,
122-
*before,
123-
slice,
124-
*after,
125-
expected,
126-
def_bm,
127-
discrim_span,
128-
)
118+
self.check_pat_slice(pat.span, before, slice, after, expected, def_bm, discrim_span)
129119
}
130120
};
131121

0 commit comments

Comments
 (0)