about summary refs log tree commit diff
path: root/src/librustdoc/html
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-12-05 23:54:25 +0100
committerGitHub <noreply@github.com>2018-12-05 23:54:25 +0100
commit64371f1cfee8d5ec8552ac8ee4cbdb4cd2629b91 (patch)
tree87bdf3cb911fbad454292ca3383bfa6f772f3c5c /src/librustdoc/html
parent1594a4245ba9951039bb39bf5e3484605ab5d068 (diff)
parent9012af6f19d999869824e3b933de5f7b30986877 (diff)
downloadrust-64371f1cfee8d5ec8552ac8ee4cbdb4cd2629b91.tar.gz
rust-64371f1cfee8d5ec8552ac8ee4cbdb4cd2629b91.zip
Rollup merge of #56119 - frewsxcv:frewsxcv-option-carrier, r=TimNN
Utilize `?` instead of `return None`.

None
Diffstat (limited to 'src/librustdoc/html')
-rw-r--r--src/librustdoc/html/render.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 2c4ddf38e98..4a20e87c081 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -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| {