Address review comments

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 23de857bdfeb1bbc6e5d34abd7acfd043caf23b4..1b7fac451ef1a922f0d5488663a5c3a19f0cfef7 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -3913,6 +3913,8 @@ fn upvarify(&self,
         }
     }
 
+    /// Searches the current set of local scopes and
+    /// applies translations for closures.
     fn search_ribs(&self,
                    ribs: &[Rib],
                    name: Name,
@@ -3934,6 +3936,8 @@ fn search_ribs(&self,
         None
     }
 
+    /// Searches the current set of local scopes for labels.
+    /// Stops after meeting a closure.
     fn search_label(&self, name: Name) -> Option<DefLike> {
         for rib in self.label_ribs.iter().rev() {
             match rib.kind {
@@ -3946,13 +3950,8 @@ fn search_label(&self, name: Name) -> Option<DefLike> {
                 }
             }
             let result = rib.bindings.get(&name).cloned();
-            match result {
-                Some(_) => {
-                    return result
-                }
-                None => {
-                    // Continue
-                }
+            if result.is_some() {
+                return result
             }
         }
         None