diff options
author | Isis Lovecruft <isis@torproject.org> | 2018-03-21 01:44:59 +0000 |
---|---|---|
committer | Isis Lovecruft <isis@torproject.org> | 2018-04-02 19:20:28 +0000 |
commit | 26bafb3c335241c01e1f165c64d4167d26acfcc6 (patch) | |
tree | 59274f064f450f1797a5dc68e9c08d9bb8cf0a85 /src/rust/protover/protover.rs | |
parent | b786b146edd33b025774819f54d7bba3d07bf832 (diff) | |
download | tor-26bafb3c335241c01e1f165c64d4167d26acfcc6.tar.gz tor-26bafb3c335241c01e1f165c64d4167d26acfcc6.zip |
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
Diffstat (limited to 'src/rust/protover/protover.rs')
-rw-r--r-- | src/rust/protover/protover.rs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index db9f5154f9..9ec29a26d8 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -215,6 +215,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. |