Skip to content
Permalink
Browse files

Utilize `?` instead of `return None`.

  • Loading branch information...
frewsxcv committed Mar 25, 2019
1 parent 4c27fb1 commit 28c602a94ebe15b45cfda59a4681d6916901aa40
Showing with 4 additions and 13 deletions.
  1. +2 −4 src/libcore/num/flt2dec/mod.rs
  2. +1 −5 src/librustc/traits/util.rs
  3. +1 −4 src/librustc_typeck/check/mod.rs
@@ -239,10 +239,8 @@ impl<'a> Formatted<'a> {

let mut written = self.sign.len();
for part in self.parts {
match part.write(&mut out[written..]) {
Some(len) => { written += len; }
None => { return None; }
}
let len = part.write(&mut out[written..])?;
written += len;
}
Some(written)
}
@@ -292,11 +292,7 @@ impl<'cx, 'gcx, 'tcx> Iterator for SupertraitDefIds<'cx, 'gcx, 'tcx> {
type Item = DefId;

fn next(&mut self) -> Option<DefId> {
let def_id = match self.stack.pop() {
Some(def_id) => def_id,
None => { return None; }
};

let def_id = self.stack.pop()?;
let predicates = self.tcx.super_predicates_of(def_id);
let visited = &mut self.visited;
self.stack.extend(
@@ -5318,10 +5318,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
) -> Option<Span> {
// Be helpful when the user wrote `{... expr;}` and
// taking the `;` off is enough to fix the error.
let last_stmt = match blk.stmts.last() {
Some(s) => s,
None => return None,
};
let last_stmt = blk.stmts.last()?;
let last_expr = match last_stmt.node {
hir::StmtKind::Semi(ref e) => e,
_ => return None,

0 comments on commit 28c602a

Please sign in to comment.
You can’t perform that action at this time.