Skip to content

Commit

Permalink
Use question_mark feature in librustc.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmedcharles committed Sep 11, 2016
1 parent e10e0bc commit 14d3937
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/librustc/hir/print.rs
Expand Up @@ -1756,9 +1756,9 @@ impl<'a> State<'a> {
self.commasep(Inconsistent, &elts[ddpos..], |s, p| s.print_pat(&p))?;
}
} else {
try!(self.commasep(Inconsistent, &elts[..], |s, p| s.print_pat(&p)));
self.commasep(Inconsistent, &elts[..], |s, p| s.print_pat(&p))?;
}
try!(self.pclose());
self.pclose()?;
}
PatKind::Path(None, ref path) => {
self.print_path(path, true, 0)?;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/infer/higher_ranked/mod.rs
Expand Up @@ -130,7 +130,7 @@ impl<'a, 'gcx, 'tcx> CombineFields<'a, 'gcx, 'tcx> {
debug!("higher_ranked_match: skol_map={:?}", skol_map);

// Equate types now that bound regions have been replaced.
try!(self.equate(a_is_expected).relate(&a_match, &b_match));
self.equate(a_is_expected).relate(&a_match, &b_match)?;

// Map each skolemized region to a vector of other regions that it
// must be equated with. (Note that this vector may include other
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/util/fs.rs
Expand Up @@ -68,7 +68,7 @@ pub fn link_or_copy<P: AsRef<Path>, Q: AsRef<Path>>(p: P, q: Q) -> io::Result<Li
let p = p.as_ref();
let q = q.as_ref();
if q.exists() {
try!(fs::remove_file(&q));
fs::remove_file(&q)?;
}

match fs::hard_link(p, q) {
Expand Down

0 comments on commit 14d3937

Please sign in to comment.