upgrade to nightly-2025-04-14

Summary:
As per the title - to review, the `rustfmt`-specific changes are isolated under `fbsource/tools/third-party/rustfmt` and the rest are codemodded

allow-large-files
ignore-conflict-markers

Reviewed By: capickett

Differential Revision: D73041643

fbshipit-source-id: 14092a58e4439d689ff7eea9cfbd9477071809e4

Author: diliop

common/rust/shed/hostcaps/src/lib.rs

@@ -12,15 +12,15 @@ use std::sync::LazyLock;
 #[cfg(fbcode_build)]
 mod facebook;
 #[cfg(fbcode_build)]
+pub use facebook::Env;
+#[cfg(fbcode_build)]
 pub use facebook::get_env;
 #[cfg(fbcode_build)]
 pub use facebook::is_corp;
 #[cfg(fbcode_build)]
 pub use facebook::is_lab;
 #[cfg(fbcode_build)]
 pub use facebook::is_prod;
-#[cfg(fbcode_build)]
-pub use facebook::Env;
 
 pub static IN_PROD: LazyLock<bool> = LazyLock::new(is_prod);
 pub static IN_CORP: LazyLock<bool> = LazyLock::new(is_corp);

eden/fs/benchmarks/benchmarks.rs

@@ -21,14 +21,14 @@ use std::os::windows::fs::OpenOptionsExt;
 use std::path::Path;
 use std::path::PathBuf;
 
-use criterion::criterion_group;
-use criterion::criterion_main;
 use criterion::Bencher;
 use criterion::Criterion;
 use criterion::Throughput;
+use criterion::criterion_group;
+use criterion::criterion_main;
+use rand::Rng;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
-use rand::Rng;
 
 const PAGE_SIZE: usize = 4096;
 const DEFAULT_FILE_SIZE: u64 = 16 * 1024 * 1024;

eden/fs/cli_rs/edenfs-client/src/attributes.rs

@@ -11,10 +11,10 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use edenfs_error::impl_eden_data_into_edenfs_result;
 use edenfs_error::EdenDataIntoEdenFsResult;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;
+use edenfs_error::impl_eden_data_into_edenfs_result;
 use edenfs_utils::bytes_from_path;
 
 use crate::client::EdenFsClient;

eden/fs/cli_rs/edenfs-client/src/backing_store.rs

@@ -8,8 +8,8 @@
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;
 

eden/fs/cli_rs/edenfs-client/src/changes_since.rs

@@ -17,9 +17,9 @@ use edenfs_utils::bytes_from_path;
 use edenfs_utils::path_from_bytes;
 use edenfs_utils::prefix_paths;
 use edenfs_utils::strip_prefix_from_bytes;
-use futures::stream;
 use futures::Stream;
 use futures::StreamExt;
+use futures::stream;
 use serde::Serialize;
 use tokio::time;
 

eden/fs/cli_rs/edenfs-client/src/checkout.rs

@@ -13,10 +13,10 @@ use std::fmt::Write as _;
 #[cfg(unix)]
 use std::fs;
 use std::fs::File;
-use std::io::prelude::*;
 use std::io::BufReader;
 use std::io::Read;
 use std::io::Write;
+use std::io::prelude::*;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
@@ -26,8 +26,8 @@ use std::str::FromStr;
 use std::time::Duration;
 use std::vec;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use atomicfile::atomic_write;
 use byteorder::BigEndian;
 use byteorder::ReadBytesExt;
@@ -40,11 +40,11 @@ use edenfs_utils::path_from_bytes;
 #[cfg(windows)]
 use edenfs_utils::strip_unc_prefix;
 use edenfs_utils::varint::decode_varint;
-use serde::ser::SerializeMap;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
 use serde::Serializer;
+use serde::ser::SerializeMap;
 use strum::EnumString;
 use strum::VariantNames;
 use thrift_types::edenfs::GlobParams;
@@ -58,10 +58,10 @@ use toml::value::Value;
 use uuid::Uuid;
 
 use crate::instance::EdenFsInstance;
-use crate::redirect::deserialize_redirections;
+use crate::redirect::REPO_SOURCE;
 use crate::redirect::Redirection;
 use crate::redirect::RedirectionType;
-use crate::redirect::REPO_SOURCE;
+use crate::redirect::deserialize_redirections;
 
 // files in the client directory (aka data_dir aka state_dir)
 const MOUNT_CONFIG: &str = "config.toml";
@@ -1378,18 +1378,18 @@ mod tests {
     use std::path::Path;
     use std::path::PathBuf;
 
-    use anyhow::anyhow;
     use anyhow::Context;
+    use anyhow::anyhow;
     use edenfs_error::EdenFsError;
     use edenfs_error::Result;
     use edenfs_error::ResultExt;
-    use tempfile::tempdir;
     use tempfile::TempDir;
+    use tempfile::tempdir;
 
     use crate::checkout::CheckoutConfig;
-    use crate::checkout::RedirectionType;
     use crate::checkout::MOUNT_CONFIG;
     use crate::checkout::REPO_SOURCE;
+    use crate::checkout::RedirectionType;
     use crate::redirect::Redirection;
     use crate::redirect::RedirectionState;
 

eden/fs/cli_rs/edenfs-client/src/client/connector/connector.rs

@@ -15,8 +15,8 @@ use fbinit::FacebookInit;
 use futures::future::BoxFuture;
 use futures::future::FutureExt;
 use futures::future::Shared;
-use thrift_thriftclients::make_EdenServiceExt_thriftclient;
 use thrift_thriftclients::EdenServiceExt;
+use thrift_thriftclients::make_EdenServiceExt_thriftclient;
 use thriftclient::ThriftChannel;
 
 use crate::client::connector::Connector;

eden/fs/cli_rs/edenfs-client/src/daemon_info.rs

@@ -10,10 +10,10 @@ use std::time::Duration;
 use anyhow::Context;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;
-use futures::stream::BoxStream;
 use futures::StreamExt;
-use tracing::event;
+use futures::stream::BoxStream;
 use tracing::Level;
+use tracing::event;
 
 use crate::client::EdenFsClient;
 use crate::client::StreamingEdenFsClient;

eden/fs/cli_rs/edenfs-client/src/instance.rs

@@ -93,8 +93,8 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::sync::OnceLock;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use atomicfile::atomic_write;
 use edenfs_config::EdenFsConfig;
 use edenfs_error::EdenFsError;
@@ -104,8 +104,8 @@ use edenfs_utils::get_executable;
 #[cfg(windows)]
 use edenfs_utils::strip_unc_prefix;
 use fbinit::expect_init;
-use tracing::event;
 use tracing::Level;
+use tracing::event;
 use util::lock::PathLock;
 
 use crate::client::EdenFsClient;

eden/fs/cli_rs/edenfs-client/src/journal.rs

@@ -12,8 +12,8 @@ use edenfs_error::EdenFsError;
 use edenfs_error::Result;
 use edenfs_error::ResultExt;
 use edenfs_utils::bytes_from_path;
-use futures::stream::BoxStream;
 use futures::StreamExt;
+use futures::stream::BoxStream;
 
 use crate::client::EdenFsClient;
 use crate::client::StreamingEdenFsClient;

eden/fs/cli_rs/edenfs-client/src/readdir.rs

@@ -10,15 +10,15 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use async_recursion::async_recursion;
-use edenfs_error::impl_eden_data_into_edenfs_result;
 use edenfs_error::EdenDataIntoEdenFsResult;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;
 use edenfs_error::ResultExt;
 use edenfs_error::ThriftRequestError;
+use edenfs_error::impl_eden_data_into_edenfs_result;
 use edenfs_utils::bytes_from_path;
 use edenfs_utils::path_from_bytes_lossy;
 

eden/fs/cli_rs/edenfs-client/src/redirect.rs

@@ -16,16 +16,16 @@ use std::path::PathBuf;
 use std::process::Command;
 use std::str::FromStr;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use async_recursion::async_recursion;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;
 use edenfs_error::ResultExt;
 #[cfg(fbcode_build)]
-use edenfs_telemetry::send;
-#[cfg(fbcode_build)]
 use edenfs_telemetry::EDEN_EVENTS_SCUBA;
+#[cfg(fbcode_build)]
+use edenfs_telemetry::send;
 use edenfs_utils::metadata::MetadataExt;
 use edenfs_utils::remove_symlink;
 #[cfg(target_os = "windows")]
@@ -39,9 +39,9 @@ use serde::Serialize;
 use toml::value::Value;
 use util::path::absolute;
 
-use crate::checkout::find_checkout;
 use crate::checkout::CheckoutConfig;
 use crate::checkout::EdenFsCheckout;
+use crate::checkout::find_checkout;
 use crate::fsutil::forcefully_remove_dir_all;
 use crate::fsutil::remove_file;
 use crate::instance::EdenFsInstance;
@@ -1941,15 +1941,15 @@ mod tests {
     use mkscratch::zzencode;
     use rand::distributions::Alphanumeric;
     use rand::distributions::DistString;
-    use serde_test::assert_ser_tokens;
     use serde_test::Token;
+    use serde_test::assert_ser_tokens;
     use tempfile::tempdir;
 
+    use crate::redirect::REPO_SOURCE;
     use crate::redirect::Redirection;
     use crate::redirect::RedirectionState;
     use crate::redirect::RedirectionType;
     use crate::redirect::RepoPathDisposition;
-    use crate::redirect::REPO_SOURCE;
 
     #[test]
     fn test_apply_symlink() {

eden/fs/cli_rs/edenfs-client/src/request_factory.rs

@@ -8,8 +8,8 @@
 use std::future::Future;
 use std::sync::Arc;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use edenfs_error::Result;
 use tokio::task::JoinSet;
 

eden/fs/cli_rs/edenfs-client/src/unmount.rs

@@ -7,8 +7,8 @@
 
 use std::path::Path;
 
-use anyhow::anyhow;
 use anyhow::Context;
+use anyhow::anyhow;
 use edenfs_error::ConnectAndRequestError;
 use edenfs_error::EdenFsError;
 use edenfs_error::Result;

eden/fs/cli_rs/edenfs-client/src/utils.rs

@@ -9,10 +9,10 @@ use std::env;
 use std::path::Path;
 use std::path::PathBuf;
 
-use anyhow::anyhow;
-use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
+use anyhow::anyhow;
+use anyhow::bail;
 use hg_util::path::expand_path;
 
 use crate::instance::DEFAULT_CONFIG_DIR;

eden/fs/cli_rs/edenfs-commands/src/config.rs

@@ -9,9 +9,9 @@
 
 use std::path::PathBuf;
 
+use anyhow::Result;
 #[cfg(windows)]
 use anyhow::anyhow;
-use anyhow::Result;
 use async_trait::async_trait;
 use clap::Parser;
 use edenfs_client::config::ConfigSourceType;

eden/fs/cli_rs/edenfs-commands/src/debug/stress.rs

@@ -9,9 +9,9 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use anyhow::anyhow;
 use anyhow::Context;
 use anyhow::Result;
+use anyhow::anyhow;
 use async_trait::async_trait;
 use clap::Parser;
 use edenfs_client::attributes::AttributesRequestScope;
@@ -20,8 +20,8 @@ use edenfs_client::attributes::SourceControlType;
 use edenfs_client::attributes::SourceControlTypeOrError;
 use edenfs_client::checkout::find_checkout;
 use edenfs_client::instance::EdenFsInstance;
-use edenfs_client::request_factory::send_requests;
 use edenfs_client::request_factory::RequestFactory;
+use edenfs_client::request_factory::send_requests;
 use edenfs_client::types::FileAttributes;
 use edenfs_client::utils::expand_path_or_cwd;
 

eden/fs/cli_rs/edenfs-commands/src/debug/subscribe.rs

@@ -22,8 +22,8 @@ use hg_util::path::expand_path;
 use serde::Serialize;
 use tokio::io::AsyncWriteExt;
 
-use crate::util::jsonrpc::ResponseBuilder;
 use crate::ExitCode;
+use crate::util::jsonrpc::ResponseBuilder;
 
 // Defines a few helper functions to make the debug format easier to read.
 mod fmt {

eden/fs/cli_rs/edenfs-commands/src/du.rs

@@ -19,9 +19,9 @@ use std::process::Command;
 #[cfg(target_os = "macos")]
 use std::process::Stdio;
 
-use anyhow::anyhow;
 use anyhow::Context;
 use anyhow::Result;
+use anyhow::anyhow;
 use async_trait::async_trait;
 use clap::Parser;
 use colored::Colorize;
@@ -32,8 +32,8 @@ use comfy_table::Row;
 use comfy_table::Table;
 #[cfg(target_os = "macos")]
 use dialoguer::Confirm;
-use edenfs_client::checkout::find_checkout;
 use edenfs_client::checkout::EdenFsCheckout;
+use edenfs_client::checkout::find_checkout;
 use edenfs_client::instance::EdenFsInstance;
 use edenfs_client::redirect;
 use edenfs_client::redirect::get_effective_redirections;
@@ -969,8 +969,8 @@ mod tests {
     use edenfs_error::ResultExt;
     use edenfs_utils::remove_symlink;
     use hg_util::path::symlink_dir;
-    use tempfile::tempdir;
     use tempfile::TempDir;
+    use tempfile::tempdir;
 
     use super::*;
 

eden/fs/cli_rs/edenfs-commands/src/gc.rs

@@ -7,8 +7,8 @@
 
 //! edenfsctl gc
 
-use std::io::stderr;
 use std::io::Write;
+use std::io::stderr;
 
 use anyhow::Result;
 use async_trait::async_trait;

eden/fs/cli_rs/edenfs-commands/src/lib.rs

@@ -20,8 +20,8 @@ use edenfs_client::utils::get_config_dir;
 use edenfs_client::utils::get_etc_eden_dir;
 use edenfs_client::utils::get_home_dir;
 use hg_util::path::expand_path;
-use tracing::event;
 use tracing::Level;
+use tracing::event;
 
 mod config;
 mod debug;