mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #79324 - LingMan:and_then, r=jonas-schievink

Browse Source 
Use Option::and_then instead of open-coding it

`@rustbot` modify labels to +C-cleanup.
This commit is contained in:
Jonas Schievink 2020-11-23 15:25:46 +01:00 committed by GitHub
commit 32be3ae06a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/mir/block.rs
View File

@ -37,12 +37,9 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
/// `funclet_bb` member if it is not `None`. /// `funclet_bb` member if it is not `None`.
fn funclet<'b, Bx: BuilderMethods<'a, 'tcx>>( fn funclet<'b, Bx: BuilderMethods<'a, 'tcx>>(
&self, &self,
fx: &'b mut FunctionCx<'a, 'tcx, Bx>, fx: &'b FunctionCx<'a, 'tcx, Bx>,
) -> Option<&'b Bx::Funclet> { ) -> Option<&'b Bx::Funclet> {
match self.funclet_bb { self.funclet_bb.and_then(|funcl| fx.funclets[funcl].as_ref())
Some(funcl) => fx.funclets[funcl].as_ref(),
None => None,
}
} }
fn lltarget<Bx: BuilderMethods<'a, 'tcx>>( fn lltarget<Bx: BuilderMethods<'a, 'tcx>>(