bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #56119 - frewsxcv:frewsxcv-option-carrier, r=TimNN

Browse source 
Utilize `?` instead of `return None`.

None
This commit is contained in:
Pietro Albini 2018-12-05 23:54:25 +01:00 • committed by GitHub
commit 64371f1cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 26 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/html/render.rs
View file

@ -2220,13 +2220,13 @@ impl<'a> Item<'a> {
return None;
}
} else {
let (krate, src_root) = match cache.extern_locations.get(&self.item.def_id.krate) {
Some(&(ref name, ref src, Local)) => (name, src),
Some(&(ref name, ref src, Remote(ref s))) => {
let (krate, src_root) = match *cache.extern_locations.get(&self.item.def_id.krate)? {
(ref name, ref src, Local) => (name, src),
(ref name, ref src, Remote(ref s)) => {
root = s.to_string();
(name, src)
}
Some(&(_, _, Unknown)) | None => return None,
(_, _, Unknown) => return None,
};
clean_srcpath(&src_root, file, false, |component| {