Skip to content

Commit ef9f0ab

Browse files
committed
Fix some nits
1 parent e7e7c36 commit ef9f0ab

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/librustc/hir/lowering.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1869,20 +1869,21 @@ impl<'a> LoweringContext<'a> {
18691869
};
18701870
let attrs = vec![attr];
18711871

1872-
// Ok(val) => { #[allow(unreachable_code)] val }
1872+
// Ok(val) => #[allow(unreachable_code)] val,
18731873
let ok_arm = {
18741874
let val_ident = self.str_to_ident("val");
18751875
let val_pat = self.pat_ident(e.span, val_ident);
18761876
let val_expr = P(self.expr_ident_with_attrs(e.span,
18771877
val_ident,
18781878
val_pat.id,
1879-
From::from(attrs.clone())));
1879+
ThinVec::from(attrs.clone())));
18801880
let ok_pat = self.pat_ok(e.span, val_pat);
18811881

18821882
self.arm(hir_vec![ok_pat], val_expr)
18831883
};
18841884

1885-
// Err(err) => return Carrier::from_error(From::from(err))
1885+
// Err(err) => #[allow(unreachable_code)]
1886+
// return Carrier::from_error(From::from(err)),
18861887
let err_arm = {
18871888
let err_ident = self.str_to_ident("err");
18881889
let err_local = self.pat_ident(e.span, err_ident);
@@ -1902,7 +1903,7 @@ impl<'a> LoweringContext<'a> {
19021903

19031904
let ret_expr = P(self.expr(e.span,
19041905
hir::Expr_::ExprRet(Some(from_err_expr)),
1905-
From::from(attrs)));
1906+
ThinVec::from(attrs)));
19061907

19071908
let err_pat = self.pat_err(e.span, err_local);
19081909
self.arm(hir_vec![err_pat], ret_expr)

src/librustc_const_eval/check_match.rs

+2
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@ fn check_arms<'a, 'tcx>(cx: &mut MatchCheckCtxt<'a, 'tcx>,
322322
hir_pat.id, diagnostic);
323323
},
324324

325+
// Unreachable patterns in try expressions occur when one of the arms
326+
// are an uninhabited type. Which is OK.
325327
hir::MatchSource::TryDesugar => {}
326328
}
327329
}

0 commit comments

Comments
 (0)