Merge remote-tracking branch 'tor-github/pr/406'

src/rust/external/external.rs

@@ -32,7 +32,6 @@ extern "C" {
 }
 
 /// Return true if Tor was built to use NSS.
-pub fn c_tor_is_using_nss() -> bool
-{
+pub fn c_tor_is_using_nss() -> bool {
     0 != unsafe { tor_is_using_nss() }
 }

src/rust/protover/protoset.rs

@@ -290,7 +290,7 @@ impl ProtoSet {
         });
 
         let pairs = pairs.collect();
-        ProtoSet::is_ok(ProtoSet{ pairs }).expect("should be already sorted")
+        ProtoSet::is_ok(ProtoSet { pairs }).expect("should be already sorted")
     }
 }
 

src/rust/protover/protover.rs

@@ -124,15 +124,15 @@ impl From<Protocol> for UnknownProtocol {
     }
 }
 
-#[cfg(feature="test_linking_hack")]
+#[cfg(feature = "test_linking_hack")]
 fn have_linkauth_v1() -> bool {
     true
 }
 
-#[cfg(not(feature="test_linking_hack"))]
+#[cfg(not(feature = "test_linking_hack"))]
 fn have_linkauth_v1() -> bool {
     use external::c_tor_is_using_nss;
-    ! c_tor_is_using_nss()
+    !c_tor_is_using_nss()
 }
 
 /// Get a CStr representation of current supported protocols, for
@@ -152,29 +152,31 @@ fn have_linkauth_v1() -> bool {
 ///
 //  C_RUST_COUPLED: protover.c `protover_get_supported_protocols`
 pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
-    if ! have_linkauth_v1() {
-        cstr!("Cons=1-2 \
-               Desc=1-2 \
-               DirCache=1-2 \
-               HSDir=1-2 \
-               HSIntro=3-4 \
-               HSRend=1-2 \
-               Link=1-5 \
-               LinkAuth=3 \
-               Microdesc=1-2 \
-               Relay=1-2"
+    if !have_linkauth_v1() {
+        cstr!(
+            "Cons=1-2 \
+             Desc=1-2 \
+             DirCache=1-2 \
+             HSDir=1-2 \
+             HSIntro=3-4 \
+             HSRend=1-2 \
+             Link=1-5 \
+             LinkAuth=3 \
+             Microdesc=1-2 \
+             Relay=1-2"
         )
     } else {
-        cstr!("Cons=1-2 \
-               Desc=1-2 \
-               DirCache=1-2 \
-               HSDir=1-2 \
-               HSIntro=3-4 \
-               HSRend=1-2 \
-               Link=1-5 \
-               LinkAuth=1,3 \
-               Microdesc=1-2 \
-               Relay=1-2"
+        cstr!(
+            "Cons=1-2 \
+             Desc=1-2 \
+             DirCache=1-2 \
+             HSDir=1-2 \
+             HSIntro=3-4 \
+             HSRend=1-2 \
+             Link=1-5 \
+             LinkAuth=1,3 \
+             Microdesc=1-2 \
+             Relay=1-2"
         )
     }
 }