[tor-commits] [tor/release-0.3.3] rust: Add macro for `impl ToString for {Unvalidated}ProtoEntry`.

[nickm@xxxxxxxxxxxxxx]

commit fa15ea104d5b9f05192afa3a023d0e2405c3842a
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Wed Mar 21 01:44:59 2018 +0000

    rust: Add macro for `impl ToString for {Unvalidated}ProtoEntry`.
    
    This implements conversions from either a ProtoEntry or an UnvalidatedProtoEntry
    into a String, for use in replacing such functions as
    `protover::write_vote_to_string()`.
    
     * ADD macro for implementing ToString trait for ProtoEntry and
       UnvalidatedProtoEntry.
     * FIXES part of #24031: https://bugs.torproject.org/24031
---
 src/rust/protover/protover.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 847406ca2..2a1a5df9e 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -226,6 +226,27 @@ impl FromStr for ProtoEntry {
     }
 }
 
+/// Generate an implementation of `ToString` for either a `ProtoEntry` or an
+/// `UnvalidatedProtoEntry`.
+macro_rules! impl_to_string_for_proto_entry {
+    ($t:ty) => (
+        impl ToString for $t {
+            fn to_string(&self) -> String {
+                let mut parts: Vec<String> = Vec::new();
+
+                for (protocol, versions) in self.iter() {
+                    parts.push(format!("{}={}", protocol.to_string(), versions.to_string()));
+                }
+                parts.sort_unstable();
+                parts.join(" ")
+            }
+        }
+    )
+}
+
+impl_to_string_for_proto_entry!(ProtoEntry);
+impl_to_string_for_proto_entry!(UnvalidatedProtoEntry);
+
 /// A `ProtoEntry`, but whose `Protocols` can be any `UnknownProtocol`, not just
 /// the supported ones enumerated in `Protocols`.  The protocol versions are
 /// validated, however.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits