bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adopt let else in more places

Browse source
This commit is contained in:
est31 2022-02-19 00:48:49 +01:00
parent b8c56fa8c3
commit 2ef8af6619
132 changed files with 539 additions and 881 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_save_analysis/src/dump_visitor.rs
View file

@ -522,9 +522,8 @@ impl<'tcx> DumpVisitor<'tcx> {
ty_params: &'tcx hir::Generics<'tcx>,
) {
let enum_data = self.save_ctxt.get_item_data(item);
let enum_data = match enum_data {
None => return,
Some(data) => data,
let Some(enum_data) = enum_data else {
return;
};
down_cast_data!(enum_data, DefData, item.span);

18
compiler/rustc_save_analysis/src/lib.rs
View file

@ -115,12 +115,9 @@ impl<'tcx> SaveContext<'tcx> {
let mut result = Vec::with_capacity(self.tcx.crates(()).len());
for &n in self.tcx.crates(()).iter() {
let span = match self.tcx.extern_crate(n.as_def_id()) {
Some(&ExternCrate { span, .. }) => span,
None => {
debug!("skipping crate {}, no data", n);
continue;
}
let Some(&ExternCrate { span, .. }) = self.tcx.extern_crate(n.as_def_id()) else {
debug!("skipping crate {}, no data", n);
continue;
};
let lo_loc = self.span_utils.sess.source_map().lookup_char_pos(span.lo());
result.push(ExternalCrateData {
@ -566,12 +563,9 @@ impl<'tcx> SaveContext<'tcx> {
}
},
hir::ExprKind::MethodCall(ref seg, ..) => {
let method_id = match self.typeck_results().type_dependent_def_id(expr.hir_id) {
Some(id) => id,
None => {
debug!("could not resolve method id for {:?}", expr);
return None;
}
let Some(method_id) = self.typeck_results().type_dependent_def_id(expr.hir_id) else {
debug!("could not resolve method id for {:?}", expr);
return None;
};
let (def_id, decl_id) = match self.tcx.associated_item(method_id).container {
ty::ImplContainer(_) => (Some(method_id), None),