applying rustfix to fbcode

Summary: applying code changes to be compatible with both 2021 and 2024 rust edition

Reviewed By: dtolnay

Differential Revision: D75237176

fbshipit-source-id: fb07f92e0f156da362061b3940b9a1cd30e312c4

Author: cjlongoria

td_util/src/file_writer.rs

@@ -14,7 +14,7 @@ use std::path::Path;
 
 use anyhow::Context;
 
-pub fn file_writer(file_path: &Path) -> anyhow::Result<impl Write> {
+pub fn file_writer(file_path: &Path) -> anyhow::Result<impl Write + use<>> {
     let file = OpenOptions::new()
         .write(true)
         .create(true)

td_util/src/json.rs

@@ -85,7 +85,7 @@ pub fn read_file_lines_parallel<T: for<'a> Deserialize<'a> + Send>(
 /// Convenience function to avoid unnecessary allocations for when further processing is needed.
 pub fn read_file_lines_par_iter<T: for<'a> Deserialize<'a> + Send>(
     filename: &Path,
-) -> anyhow::Result<impl ParallelIterator<Item = anyhow::Result<T>>> {
+) -> anyhow::Result<impl ParallelIterator<Item = anyhow::Result<T>> + use<T>> {
     let file = open_file(filename)?;
     // 10MB buffer
     let rdr = BufReader::with_capacity(BUFFER_SIZE, file);

td_util/src/supertd_events.rs

@@ -103,10 +103,10 @@ pub fn init(fb: fbinit::FacebookInit) -> ScubaClientGuard {
 /// ```
 #[macro_export]
 macro_rules! scuba {
-    ( event: $event:ident $(, $key:ident : $value:expr)* $(,)? ) => {
+    ( event: $event:ident $(, $key:ident : $value:expr_2021)* $(,)? ) => {
         // @oss-disable: $crate::scuba_logger! {event: $event $(, $key : $value)*};
     };
-    ( $($key:ident : $value:expr),* $(,)? ) => {
+    ( $($key:ident : $value:expr_2021),* $(,)? ) => {
         compile_error!("`event` must be the first field in the `scuba!` macro");
     };
 }

td_util/src/supertd_events_logger.rs

@@ -84,19 +84,19 @@ mod linux {
     /// ```
     #[macro_export]
     macro_rules! scuba_logger {
-    ( event: $event:ident $(, $key:ident : $value:expr)* $(,)? ) => {
+    ( event: $event:ident $(, $key:ident : $value:expr_2021)* $(,)? ) => {
         let mut builder = $crate::supertd_events_logger::log_entry();
         builder.set_event(format!("{:?}", &$crate::supertd_events::Event::$event));
         $($crate::scuba_logger! { @SET_FIELD(builder, $key, $value) })*
         $crate::supertd_events_logger::log(&builder);
     };
-    ( $($key:ident : $value:expr),* $(,)? ) => {
+    ( $($key:ident : $value:expr_2021),* $(,)? ) => {
         compile_error!("`event` must be the first field in the `scuba!` macro");
     };
-    ( @SET_FIELD ( $builder:ident, event, $value:expr ) ) => {
+    ( @SET_FIELD ( $builder:ident, event, $value:expr_2021 ) ) => {
         compile_error!("duplicate `event` field in `scuba!` macro");
     };
-    ( @SET_FIELD ( $builder:ident, data, $value:expr ) ) => {{
+    ( @SET_FIELD ( $builder:ident, data, $value:expr_2021 ) ) => {{
         use $crate::supertd_events::serde_json::json;
         match $crate::supertd_events::serde_json::to_string(&$value) {
             Ok(json) => {
@@ -108,13 +108,13 @@ mod linux {
             }
         }
     }};
-    ( @SET_FIELD ( $builder:ident, duration, $value:expr ) ) => {
+    ( @SET_FIELD ( $builder:ident, duration, $value:expr_2021 ) ) => {
         $builder.set_duration_ms(::std::time::Duration::as_millis(&$value) as i64);
     };
-    ( @SET_FIELD ( $builder:ident, duration_ms, $value:expr ) ) => {
+    ( @SET_FIELD ( $builder:ident, duration_ms, $value:expr_2021 ) ) => {
         compile_error!("unrecognized column name in `scuba!` macro: duration_ms (use `duration` instead)");
     };
-    ( @SET_FIELD ( $builder:ident, $key:ident, $value:expr ) ) => {
+    ( @SET_FIELD ( $builder:ident, $key:ident, $value:expr_2021 ) ) => {
         compile_error!(concat!("unrecognized column name in `scuba!` macro: ", stringify!($key)));
     };
 }