From: Corey Farwell <coreyf@rwell.org>
Date: Sun, 24 Jun 2018 14:27:46 +0000 (-0400)
Subject: Utilize `if..else` for switching on boolean values.
X-Git-Tag: tor-0.3.5.1-alpha~214^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59d4505749073f45db9a32d606b760eb9e07df69;p=thirdparty%2Ftor.git

Utilize `if..else` for switching on boolean values.
---

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f668dba80b..ba156cb1ba 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -105,9 +105,10 @@ pub extern "C" fn protocol_list_supports_protocol(
         Ok(n) => n.into(),
         Err(_) => return 0,
     };
-    match proto_entry.supports_protocol(&protocol, &version) {
-        false => return 0,
-        true  => return 1,
+    if proto_entry.supports_protocol(&protocol, &version) {
+        1
+    } else {
+        0
     }
 }
 
@@ -206,13 +207,16 @@ pub extern "C" fn protover_compute_vote(
     let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new();
 
     for datum in data {
-        let entry: UnvalidatedProtoEntry = match allow_long_proto_names {
-            true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) {
+        let entry: UnvalidatedProtoEntry = if allow_long_proto_names {
+            match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) {
                 Ok(n)  => n,
-                Err(_) => continue},
-            false => match datum.parse() {
+                Err(_) => continue
+            }
+        } else {
+            match datum.parse() {
                 Ok(n)  => n,
-                Err(_) => continue},
+                Err(_) => continue
+            }
         };
         proto_entries.push(entry);
     }