Skip to content

Commit 5059a9a

Browse files
authored
Rollup merge of #59419 - frewsxcv:frewsxcv-qu, r=varkor
Utilize `?` instead of `return None`. None
2 parents 25f3ae9 + 28c602a commit 5059a9a

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

src/libcore/num/flt2dec/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,8 @@ impl<'a> Formatted<'a> {
239239

240240
let mut written = self.sign.len();
241241
for part in self.parts {
242-
match part.write(&mut out[written..]) {
243-
Some(len) => { written += len; }
244-
None => { return None; }
245-
}
242+
let len = part.write(&mut out[written..])?;
243+
written += len;
246244
}
247245
Some(written)
248246
}

src/librustc/traits/util.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,7 @@ impl<'cx, 'gcx, 'tcx> Iterator for SupertraitDefIds<'cx, 'gcx, 'tcx> {
292292
type Item = DefId;
293293

294294
fn next(&mut self) -> Option<DefId> {
295-
let def_id = match self.stack.pop() {
296-
Some(def_id) => def_id,
297-
None => { return None; }
298-
};
299-
295+
let def_id = self.stack.pop()?;
300296
let predicates = self.tcx.super_predicates_of(def_id);
301297
let visited = &mut self.visited;
302298
self.stack.extend(

src/librustc_typeck/check/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -5318,10 +5318,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
53185318
) -> Option<Span> {
53195319
// Be helpful when the user wrote `{... expr;}` and
53205320
// taking the `;` off is enough to fix the error.
5321-
let last_stmt = match blk.stmts.last() {
5322-
Some(s) => s,
5323-
None => return None,
5324-
};
5321+
let last_stmt = blk.stmts.last()?;
53255322
let last_expr = match last_stmt.node {
53265323
hir::StmtKind::Semi(ref e) => e,
53275324
_ => return None,

0 commit comments

Comments
 (0)