diff options
author | Chelsea Holland Komlo <me@chelseakomlo.com> | 2017-10-26 09:50:50 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-10-27 10:02:08 -0400 |
commit | 6be75bd61d72636a1c23b6fd9866d33a35433a73 (patch) | |
tree | e126a94f3baf863f49f5ff0addcc952ce20e3018 /src/rust/protover/protover.rs | |
parent | 90daad999e78c8ec8239e63ea03df6b3b2e364b6 (diff) | |
download | tor-6be75bd61d72636a1c23b6fd9866d33a35433a73.tar.gz tor-6be75bd61d72636a1c23b6fd9866d33a35433a73.zip |
cargo fmt; fix line length warnings
Diffstat (limited to 'src/rust/protover/protover.rs')
-rw-r--r-- | src/rust/protover/protover.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 8a546e09a3..d75da61aa8 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -142,7 +142,8 @@ fn tor_supported() -> Result<HashMap<Proto, HashSet<u32>>, &'static str> { /// This function will error if: /// /// * the `version_string` is empty or contains an equals (`"="`) sign, -/// * the expansion of a version range produces an error (see `expand_version_range`), +/// * the expansion of a version range produces an error (see +/// `expand_version_range`), /// * any single version number is not parseable as an `u32` in radix 10, or /// * there are greater than 2^16 version numbers to expand. /// @@ -293,10 +294,12 @@ pub fn all_supported(protocols: &str) -> (bool, String) { /// ``` /// use protover::*; /// -/// let is_supported = protover_string_supports_protocol("Link=3-4 Cons=1", Proto::Cons,1); +/// let is_supported = protover_string_supports_protocol("Link=3-4 Cons=1", +/// Proto::Cons,1); /// assert_eq!(true, is_supported); /// -/// let is_not_supported = protover_string_supports_protocol("Link=3-4 Cons=1", Proto::Cons,5); +/// let is_not_supported = protover_string_supports_protocol("Link=3-4 Cons=1", +/// Proto::Cons,5); /// assert_eq!(false, is_not_supported) /// ``` pub fn protover_string_supports_protocol( @@ -363,7 +366,7 @@ fn expand_version_range(range: &str) -> Result<Vec<u32>, &'static str> { ))?; // We can use inclusive range syntax when it becomes stable. - Ok((lower..higher+1).collect()) + Ok((lower..higher + 1).collect()) } /// Checks to see if there is a continuous range of integers, starting at the @@ -477,8 +480,7 @@ fn contract_protocol_list<'a>(supported_set: &'a HashSet<u32>) -> String { fn parse_protocols_from_string_with_no_validation<'a>( protocol_string: &'a str, ) -> Result<HashMap<String, HashSet<u32>>, &'static str> { - let protocols = &protocol_string.split(" ") - .collect::<Vec<&'a str>>()[..]; + let protocols = &protocol_string.split(" ").collect::<Vec<&'a str>>()[..]; let mut parsed: HashMap<String, HashSet<u32>> = HashMap::new(); |