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

Diff for: allocative/allocative/src/flamegraph.rs

@@ -7,20 +7,20 @@
  * of this source tree.
  */
 
-use std::collections::hash_map;
 use std::collections::HashMap;
 use std::collections::HashSet;
+use std::collections::hash_map;
 use std::fmt::Write as _;
 use std::mem;
 use std::ops::Index;
 use std::ops::IndexMut;
 
+use crate::Allocative;
 use crate::global_root::roots;
 use crate::key::Key;
 use crate::visitor::NodeKind;
 use crate::visitor::Visitor;
 use crate::visitor::VisitorImpl;
-use crate::Allocative;
 
 /// Node in flamegraph tree.
 ///
@@ -496,11 +496,11 @@ impl VisitorImpl for FlameGraphBuilder {
 
 #[cfg(test)]
 mod tests {
+    use crate::FlameGraph;
     use crate::flamegraph::FlameGraphBuilder;
     use crate::flamegraph::Tree;
     use crate::flamegraph::Trees;
     use crate::key::Key;
-    use crate::FlameGraph;
 
     #[test]
     fn test_empty() {

Diff for: allocative/allocative/src/impls/num_bigint.rs

@@ -14,10 +14,10 @@ use std::mem;
 use num_bigint::BigInt;
 use num_bigint::BigUint;
 
-use crate::impls::common::DATA_NAME;
-use crate::impls::common::PTR_NAME;
 use crate::Allocative;
 use crate::Visitor;
+use crate::impls::common::DATA_NAME;
+use crate::impls::common::PTR_NAME;
 
 impl Allocative for BigInt {
     fn visit<'a, 'b: 'a>(&self, visitor: &'a mut Visitor<'b>) {

Diff for: allocative/allocative/src/impls/std/cell.rs

@@ -11,9 +11,9 @@ use std::cell::OnceCell;
 use std::cell::RefCell;
 use std::sync::OnceLock;
 
-use crate::impls::common::DATA_NAME;
 use crate::Allocative;
 use crate::Visitor;
+use crate::impls::common::DATA_NAME;
 
 impl<T: Allocative> Allocative for RefCell<T> {
     fn visit<'a, 'b: 'a>(&self, visitor: &'a mut Visitor<'b>) {

Diff for: allocative/allocative/src/impls/std/sync.rs

@@ -11,21 +11,21 @@ use std::alloc::Layout;
 use std::mem;
 use std::rc;
 use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::sync::RwLock;
+use std::sync::Weak;
 use std::sync::atomic::AtomicBool;
+use std::sync::atomic::AtomicI8;
 use std::sync::atomic::AtomicI16;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::AtomicI64;
-use std::sync::atomic::AtomicI8;
 use std::sync::atomic::AtomicIsize;
+use std::sync::atomic::AtomicU8;
 use std::sync::atomic::AtomicU16;
 use std::sync::atomic::AtomicU32;
 use std::sync::atomic::AtomicU64;
-use std::sync::atomic::AtomicU8;
 use std::sync::atomic::AtomicUsize;
-use std::sync::Arc;
-use std::sync::Mutex;
-use std::sync::RwLock;
-use std::sync::Weak;
 
 use crate::allocative_trait::Allocative;
 use crate::impls::common::PTR_NAME;
@@ -220,8 +220,8 @@ mod tests {
     use std::sync::Arc;
 
     use crate as allocative;
-    use crate::golden::golden_test;
     use crate::Allocative;
+    use crate::golden::golden_test;
 
     #[derive(Allocative)]
     #[repr(align(64))]

Diff for: allocative/allocative/src/impls/std/unsorted.rs

@@ -12,15 +12,15 @@ use std::convert::Infallible;
 use std::ffi::OsStr;
 use std::marker::PhantomData;
 use std::mem;
+use std::num::NonZeroI8;
 use std::num::NonZeroI16;
 use std::num::NonZeroI32;
 use std::num::NonZeroI64;
-use std::num::NonZeroI8;
 use std::num::NonZeroIsize;
+use std::num::NonZeroU8;
 use std::num::NonZeroU16;
 use std::num::NonZeroU32;
 use std::num::NonZeroU64;
-use std::num::NonZeroU8;
 use std::num::NonZeroUsize;
 use std::path::PathBuf;
 

Diff for: allocative/allocative/src/impls/triomphe.rs

@@ -18,10 +18,10 @@ use triomphe::HeaderSlice;
 use triomphe::HeaderWithLength;
 use triomphe::ThinArc;
 
-use crate::impls::common::PTR_NAME;
 use crate::Allocative;
 use crate::Key;
 use crate::Visitor;
+use crate::impls::common::PTR_NAME;
 
 impl<H: Allocative, T: Allocative + ?Sized> Allocative for HeaderSlice<H, T> {
     fn visit<'a, 'b: 'a>(&self, visitor: &'a mut Visitor<'b>) {

Diff for: allocative/allocative/src/lib.rs

@@ -57,8 +57,8 @@ mod size_of;
 mod test_derive;
 mod visitor;
 
-pub use allocative_derive::root;
 pub use allocative_derive::Allocative;
+pub use allocative_derive::root;
 
 pub use crate::allocative_trait::Allocative;
 pub use crate::flamegraph::FlameGraph;
@@ -82,9 +82,9 @@ pub mod __macro_refs {
 /// The main use case is manual implementations of [`Allocative`], like so:
 ///
 /// ```
-/// use allocative::ident_key;
 /// use allocative::Allocative;
 /// use allocative::Visitor;
+/// use allocative::ident_key;
 ///
 /// struct MyStruct {
 ///     foo: usize,

Diff for: allocative/allocative/src/size_of.rs

@@ -7,11 +7,11 @@
  * of this source tree.
  */
 
-use crate::visitor::NodeKind;
-use crate::visitor::VisitorImpl;
 use crate::Allocative;
 use crate::Key;
 use crate::Visitor;
+use crate::visitor::NodeKind;
+use crate::visitor::VisitorImpl;
 
 /// Size of data allocated in unique pointers in the struct.
 ///

Diff for: allocative/allocative_derive/src/derive_allocative.rs

@@ -9,10 +9,8 @@
 
 use proc_macro2::Ident;
 use proc_macro2::Span;
-use quote::quote_spanned;
 use quote::ToTokens;
-use syn::parse::ParseStream;
-use syn::spanned::Spanned;
+use quote::quote_spanned;
 use syn::Attribute;
 use syn::Data;
 use syn::DataEnum;
@@ -28,6 +26,8 @@ use syn::LitStr;
 use syn::Path;
 use syn::Token;
 use syn::Variant;
+use syn::parse::ParseStream;
+use syn::spanned::Spanned;
 
 const fn hash(s: &str) -> u64 {
     let mut hash = 0xcbf29ce484222325;

Diff for: app/buck2/bin/buck2.rs

@@ -19,17 +19,17 @@ use std::time::UNIX_EPOCH;
 use buck2::exec;
 use buck2::panic;
 use buck2::process_context::ProcessContext;
-use buck2_build_info::Buck2BuildInfo;
 use buck2_build_info::BUCK2_BUILD_INFO;
+use buck2_build_info::Buck2BuildInfo;
 use buck2_client_ctx::exit_result::ExitResult;
 use buck2_client_ctx::restarter::Restarter;
 use buck2_client_ctx::stdin::Stdin;
 use buck2_client_ctx::stdio;
 use buck2_core::buck2_env;
 use buck2_core::fs::working_dir::AbsWorkingDir;
+use buck2_core::logging::LogConfigurationReloadHandle;
 use buck2_core::logging::init_tracing_for_writer;
 use buck2_core::logging::log_file::TracingLogFile;
-use buck2_core::logging::LogConfigurationReloadHandle;
 use buck2_error::conversion::from_any_with_tag;
 use buck2_wrapper_common::invocation_id::TraceId;
 use dupe::Dupe;

Diff for: app/buck2/src/check_user_allowed.rs

@@ -22,9 +22,9 @@ pub(crate) fn check_user_allowed() -> buck2_error::Result<()> {
     use winapi::um::processthreadsapi::GetCurrentProcess;
     use winapi::um::processthreadsapi::OpenProcessToken;
     use winapi::um::securitybaseapi::GetTokenInformation;
-    use winapi::um::winnt::TokenElevation;
     use winapi::um::winnt::TOKEN_ELEVATION;
     use winapi::um::winnt::TOKEN_QUERY;
+    use winapi::um::winnt::TokenElevation;
 
     let mut handle = ptr::null_mut();
     let token_ok = unsafe { OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut handle) };

Diff for: app/buck2/src/cli_style.rs

@@ -7,8 +7,8 @@
  * of this source tree.
  */
 
-use clap::builder::styling;
 use clap::builder::Styles;
+use clap::builder::styling;
 
 pub(crate) fn get_styles() -> Styles {
     let heading = styling::AnsiColor::Yellow.on_default().bold();

Diff for: app/buck2/src/lib.rs

@@ -53,9 +53,9 @@ use buck2_common::invocation_paths_result::InvocationPathsResult;
 use buck2_common::invocation_roots::get_invocation_paths_result;
 use buck2_core::buck2_env;
 use buck2_core::fs::paths::file_name::FileNameBuf;
+use buck2_error::BuckErrorContext;
 use buck2_error::buck2_error;
 use buck2_error::conversion::from_any_with_tag;
-use buck2_error::BuckErrorContext;
 use buck2_event_observer::verbosity::Verbosity;
 use buck2_util::threads::thread_spawn_scoped;
 use clap::CommandFactory;

Diff for: app/buck2/src/panic.rs

@@ -60,10 +60,10 @@ mod imp {
     use backtrace::Backtrace;
     use buck2_core::error::StructuredErrorOptions;
     use buck2_data::Location;
+    use buck2_events::BuckEvent;
     use buck2_events::metadata;
-    use buck2_events::sink::remote::new_remote_event_sink_if_enabled;
     use buck2_events::sink::remote::ScribeConfig;
-    use buck2_events::BuckEvent;
+    use buck2_events::sink::remote::new_remote_event_sink_if_enabled;
     use buck2_util::threads::thread_spawn;
     use fbinit::FacebookInit;
     use tokio::runtime::Builder;

Diff for: app/buck2_action_impl/src/actions/impls/cas_artifact.rs

@@ -14,13 +14,13 @@ use std::sync::Arc;
 use allocative::Allocative;
 use async_trait::async_trait;
 use buck2_artifact::artifact::build_artifact::BuildArtifact;
+use buck2_build_api::actions::Action;
+use buck2_build_api::actions::ActionExecutionCtx;
+use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionKind;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionMetadata;
 use buck2_build_api::actions::execute::action_executor::ActionOutputs;
 use buck2_build_api::actions::execute::error::ExecuteError;
-use buck2_build_api::actions::Action;
-use buck2_build_api::actions::ActionExecutionCtx;
-use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::artifact_groups::ArtifactGroup;
 use buck2_common::file_ops::FileDigest;
 use buck2_common::file_ops::FileMetadata;
@@ -31,10 +31,10 @@ use buck2_core::execution_types::executor_config::RemoteExecutorUseCase;
 use buck2_error::BuckErrorContext;
 use buck2_execute::artifact_value::ArtifactValue;
 use buck2_execute::digest::CasDigestToReExt;
-use buck2_execute::directory::re_directory_to_re_tree;
-use buck2_execute::directory::re_tree_to_directory;
 use buck2_execute::directory::ActionDirectoryEntry;
 use buck2_execute::directory::INTERNER;
+use buck2_execute::directory::re_directory_to_re_tree;
+use buck2_execute::directory::re_tree_to_directory;
 use buck2_execute::execute::command_executor::ActionExecutionTimingData;
 use buck2_execute::materialize::materializer::CasDownloadInfo;
 use chrono::DateTime;

Diff for: app/buck2_action_impl/src/actions/impls/copy.rs

@@ -12,14 +12,14 @@ use std::borrow::Cow;
 use allocative::Allocative;
 use async_trait::async_trait;
 use buck2_artifact::artifact::build_artifact::BuildArtifact;
+use buck2_build_api::actions::Action;
+use buck2_build_api::actions::ActionExecutionCtx;
+use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::actions::box_slice_set::BoxSliceSet;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionKind;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionMetadata;
 use buck2_build_api::actions::execute::action_executor::ActionOutputs;
 use buck2_build_api::actions::execute::error::ExecuteError;
-use buck2_build_api::actions::Action;
-use buck2_build_api::actions::ActionExecutionCtx;
-use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::artifact_groups::ArtifactGroup;
 use buck2_core::category::CategoryRef;
 use buck2_error::BuckErrorContext;

Diff for: app/buck2_action_impl/src/actions/impls/download_file.rs

@@ -13,29 +13,29 @@ use std::sync::Arc;
 use allocative::Allocative;
 use async_trait::async_trait;
 use buck2_artifact::artifact::build_artifact::BuildArtifact;
+use buck2_build_api::actions::Action;
+use buck2_build_api::actions::ActionExecutionCtx;
+use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionKind;
 use buck2_build_api::actions::execute::action_executor::ActionExecutionMetadata;
 use buck2_build_api::actions::execute::action_executor::ActionOutputs;
 use buck2_build_api::actions::execute::error::ExecuteError;
-use buck2_build_api::actions::Action;
-use buck2_build_api::actions::ActionExecutionCtx;
-use buck2_build_api::actions::UnregisteredAction;
 use buck2_build_api::artifact_groups::ArtifactGroup;
 use buck2_common::cas_digest::RawDigest;
 use buck2_common::file_ops::FileDigest;
 use buck2_common::file_ops::FileMetadata;
 use buck2_common::file_ops::TrackedFileDigest;
 use buck2_common::io::trace::TracingIoProvider;
 use buck2_core::category::CategoryRef;
-use buck2_error::conversion::from_any_with_tag;
 use buck2_error::BuckErrorContext;
 use buck2_error::ErrorTag;
+use buck2_error::conversion::from_any_with_tag;
 use buck2_execute::artifact_value::ArtifactValue;
 use buck2_execute::digest_config::DigestConfig;
 use buck2_execute::execute::command_executor::ActionExecutionTimingData;
+use buck2_execute::materialize::http::Checksum;
 use buck2_execute::materialize::http::http_download;
 use buck2_execute::materialize::http::http_head;
-use buck2_execute::materialize::http::Checksum;
 use buck2_execute::materialize::materializer::HttpDownloadInfo;
 use buck2_http::HttpClient;
 use dupe::Dupe;

Diff for: app/buck2_action_impl/src/actions/impls/offline.rs

@@ -8,8 +8,8 @@
  */
 
 use buck2_artifact::artifact::build_artifact::BuildArtifact;
-use buck2_build_api::actions::execute::action_executor::ActionOutputs;
 use buck2_build_api::actions::ActionExecutionCtx;
+use buck2_build_api::actions::execute::action_executor::ActionOutputs;
 use buck2_common::file_ops::FileDigestConfig;
 use buck2_core::fs::project_rel_path::ProjectRelativePathBuf;
 use buck2_execute::artifact_value::ArtifactValue;