[tor-commits] [tor/master] rust: Refactor Rust impl of protover_list_supports_protocol().

[nickm at torproject.org]

commit 52c3ea50454bcbcbcf5b18e628a1490441962b33
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Mar 21 02:52:04 2018 +0000

    rust: Refactor Rust impl of protover_list_supports_protocol().
    
    This includes a subtle difference in behaviour, as in 4258f1e18, where we return
    (matching the C impl's return behaviour) earlier than before if parsing failed,
    saving us computation in parsing the versions into a
    protover::protoset::ProtoSet.
    
     * REFACTOR `protover::ffi::protover_list_supports_protocol()` to use new types
       and methods.
---
 src/rust/protover/ffi.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 1588b2e4d..0d0376e52 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -98,16 +98,18 @@ pub extern "C" fn protocol_list_supports_protocol(
         Ok(n) => n,
         Err(_) => return 1,
     };
-
-    let protocol = match translate_to_rust(c_protocol) {
-        Ok(n) => n,
+    let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() {
+        Ok(n)  => n,
         Err(_) => return 0,
     };
-
-    let is_supported =
-        protover_string_supports_protocol(protocol_list, protocol, version);
-
-    return if is_supported { 1 } else { 0 };
+    let protocol: UnknownProtocol = match translate_to_rust(c_protocol) {
+        Ok(n) => n.into(),
+        Err(_) => return 0,
+    };
+    match proto_entry.supports_protocol(&protocol, &version) {
+        false => return 0,
+        true  => return 1,
+    }
 }
 
 /// Provide an interface for C to translate arguments and return types for