Simplify Role's Ord impl

serenity-rs · Dec 28, 2016 · 6a887b2 · 6a887b2
1 parent 5b275fc
commit 6a887b2
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/model/guild.rs b/src/model/guild.rs
@@ -1150,18 +1150,10 @@ impl Eq for Role {}
 
 impl Ord for Role {
     fn cmp(&self, other: &Role) -> Ordering {
-        if self.position > other.position {
-            Ordering::Greater
-        } else if self.position == other.position {
-            if self.id > other.id {
-                Ordering::Greater
-            } else if self.id == other.id {
-                Ordering::Equal
-            } else {
-                Ordering::Less
-            }
+        if self.position == other.position {
+            self.id.cmp(&other.id)
         } else {
-            Ordering::Less
+            self.position.cmp(&other.position)
         }
     }
 }