]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Utilize `if..else` for switching on boolean values.
authorCorey Farwell <coreyf@rwell.org>
Sun, 24 Jun 2018 14:27:46 +0000 (10:27 -0400)
committerCorey Farwell <coreyf@rwell.org>
Mon, 25 Jun 2018 02:44:36 +0000 (22:44 -0400)
src/rust/protover/ffi.rs

index f668dba80bd0e0953d3f7f53c18dc7c33cd19962..ba156cb1ba485427f52a955dba3fe60d1f1a8d68 100644 (file)
@@ -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);
     }