Prepare for rustfmt 2.0

Summary: Generated by formatting with rustfmt 2.0.0-rc.2 and then a second time with fbsource's current rustfmt (1.4.14). This results in formatting for which rustfmt 1.4 is idempotent but is closer to the style of rustfmt 2.0, reducing the amount of code that will need to change atomically in that upgrade. --- *Why now?* **:** The 1.x branch is no longer being developed and fixes like rust-lang/rustfmt#4159 (which we need in fbcode) only land to the 2.0 branch. --- Reviewed By: zertosh Differential Revision: D23568786 fbshipit-source-id: e9beea000c76f0683b8e817ee198eed88e5737f1
facebookexperimental · Sep 8, 2020 · fd5be89 · fd5be89
1 parent d303bcf
commit fd5be89
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/shed/futures_ext/src/stream_clone.rs b/shed/futures_ext/src/stream_clone.rs
@@ -113,7 +113,7 @@ where
                 for tx in &mut self.senders {
                     match tx.poll_complete() {
                         Err(_) => return Err(()),
-                        Ok(Async::Ready(())) => (),
+                        Ok(Async::Ready(())) => {}
                         Ok(Async::NotReady) => {
                             done = false;
                         }

diff --git a/shed/netstring/src/decode.rs b/shed/netstring/src/decode.rs
@@ -190,7 +190,7 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -207,15 +207,15 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
             ),
         }
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"world" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"world" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -232,15 +232,15 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
             ),
         }
 
         match codec.decode(&mut buf) {
-            Ok(None) => (),
+            Ok(None) => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -256,7 +256,7 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(None) => (),
+            Ok(None) => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -266,7 +266,7 @@ mod test {
         buf.put_slice(b"2:hello, world,");
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -282,7 +282,7 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(None) => (),
+            Ok(None) => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -292,7 +292,7 @@ mod test {
         buf.put_slice(b":hello, world,");
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -308,7 +308,7 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(None) => (),
+            Ok(None) => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -318,7 +318,7 @@ mod test {
         buf.put_slice(b" world,");
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -334,7 +334,7 @@ mod test {
         let mut codec = NetstringDecoder::default();
 
         match codec.decode(&mut buf) {
-            Ok(None) => (),
+            Ok(None) => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))
@@ -344,7 +344,7 @@ mod test {
         buf.put_slice(b",");
 
         match codec.decode(&mut buf) {
-            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => (),
+            Ok(Some(ref res)) if res.as_ref() == b"hello, world" => {}
             bad => panic!(
                 "decode failed: {:?}",
                 bad.as_ref().map(|x| x.as_ref().map(BytesMut::as_ref))

diff --git a/shed/panichandler/src/lib.rs b/shed/panichandler/src/lib.rs
@@ -100,7 +100,7 @@ fn handler(panic: &PanicInfo<'_>, fate: Fate) {
     let _ = w.into_inner();
 
     match fate {
-        Fate::Continue => (),
+        Fate::Continue => {}
         Fate::Exit(exit) => {
             #[cfg(unix)]
             unsafe {

diff --git a/shed/sorted_vector_map/src/map.rs b/shed/sorted_vector_map/src/map.rs
@@ -847,7 +847,6 @@ macro_rules! sorted_vector_map {
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
     use quickcheck::quickcheck;
     use std::collections::BTreeMap;

diff --git a/shed/sorted_vector_map/src/set.rs b/shed/sorted_vector_map/src/set.rs
@@ -665,7 +665,6 @@ macro_rules! sorted_vector_set {
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
     use quickcheck::quickcheck;
     use std::collections::BTreeSet;

diff --git a/shed/sql/common/transaction.rs b/shed/sql/common/transaction.rs
@@ -165,7 +165,7 @@ impl Drop for Transaction {
                     );
                 }
             }
-            Transaction::Mysql(_) => (),
+            Transaction::Mysql(_) => {}
         }
     }
 }
diff --git a/shed/stats/src/thread_local_aggregator.rs b/shed/stats/src/thread_local_aggregator.rs
@@ -204,13 +204,13 @@ mod tests {
         let _lock = TEST_MUTEX.lock().expect("poisoned lock");
 
         match schedule_stats_aggregation() {
-            Ok(_) => (),
+            Ok(_) => {}
             Err(err) => panic!("Scheduler is not Ok. Reason: {:?}", err),
         }
 
         match schedule_stats_aggregation() {
             Ok(_) => panic!("Scheduler should already be initialized"),
-            Err(StatsScheduledError(_)) => (),
+            Err(StatsScheduledError(_)) => {}
         }
 
         STATS_SCHEDULED.swap(false, atomic::Ordering::AcqRel);
@@ -221,13 +221,13 @@ mod tests {
         let _lock = TEST_MUTEX.lock().expect("poisoned lock");
 
         match schedule_stats_aggregation_preview() {
-            Ok(_) => (),
+            Ok(_) => {}
             Err(err) => panic!("Scheduler is not Ok. Reason: {:?}", err),
         }
 
         match schedule_stats_aggregation_preview() {
             Ok(_) => panic!("Scheduler should already be initialized"),
-            Err(StatsScheduledErrorPreview(_)) => (),
+            Err(StatsScheduledErrorPreview(_)) => {}
         }
 
         STATS_SCHEDULED.swap(false, atomic::Ordering::AcqRel);

diff --git a/shed/thrift_compiler/tests/main.rs b/shed/thrift_compiler/tests/main.rs
@@ -59,7 +59,7 @@ fn run_thrift(
 
         match option_env!("TEST_THRIFT") {
             Some(thrift_bin) if env::var("THRIFT").is_err() => env::set_var("THRIFT", thrift_bin),
-            _ => (),
+            _ => {}
         }
 
         Config::from_env().context("Failed to create thrift compiler")?