about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2019-05-29 14:41:13 +0200
committerGitHub <noreply@github.com>2019-05-29 14:41:13 +0200
commitb742d7ee6a81bf6acada69b0375b0566926aba23 (patch)
tree075fbce72732c7c2fa6fa00f98ce61d349e979b4 /src
parent18967566c779d7f697229e82c3ae4de50426c2ae (diff)
parent3f3087bb7f78426d033e95c3d2dcecce8878d02e (diff)
Rollup merge of #61313 - Centril:simplify-set1-insert, r=varkor
Simplify Set1::insert

r? @varkor
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/resolve_lifetime.rs15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs
index 736b4633b38..593a09b6866 100644
--- a/src/librustc/middle/resolve_lifetime.rs
+++ b/src/librustc/middle/resolve_lifetime.rs
@@ -170,16 +170,11 @@ pub enum Set1<T> {
 
 impl<T: PartialEq> Set1<T> {
     pub fn insert(&mut self, value: T) {
-        if let Set1::Empty = *self {
-            *self = Set1::One(value);
-            return;
-        }
-        if let Set1::One(ref old) = *self {
-            if *old == value {
-                return;
-            }
-        }
-        *self = Set1::Many;
+        *self = match self {
+            Set1::Empty => Set1::One(value),
+            Set1::One(old) if *old == value => return,
+            _ => Set1::Many,
+        };
     }
 }