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

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() {

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>) {

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>) {

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))]

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;
 

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>) {

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,

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.
 ///

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;

gazebo/dupe_derive/src/clone.rs

@@ -8,8 +8,8 @@
  */
 
 use quote::quote;
-use syn::parse_macro_input;
 use syn::DeriveInput;
+use syn::parse_macro_input;
 
 use crate::util::duplicate_impl;
 

gazebo/dupe_derive/src/copy.rs

@@ -8,8 +8,8 @@
  */
 
 use quote::quote;
-use syn::parse_macro_input;
 use syn::DeriveInput;
+use syn::parse_macro_input;
 
 pub fn derive_copy_(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input = parse_macro_input!(input as DeriveInput);

gazebo/dupe_derive/src/dupe.rs

@@ -9,12 +9,12 @@
 
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::parse_macro_input;
-use syn::parse_quote;
 use syn::DeriveInput;
 use syn::Ident;
 use syn::Type;
 use syn::TypeParamBound;
+use syn::parse_macro_input;
+use syn::parse_quote;
 
 use crate::util::add_trait_bounds;
 use crate::util::extract_all_field_tys;

gazebo/dupe_derive/src/util.rs

@@ -12,7 +12,6 @@ use std::iter;
 use proc_macro2::TokenStream;
 use quote::quote;
 use quote::quote_spanned;
-use syn::spanned::Spanned;
 use syn::Data;
 use syn::DataEnum;
 use syn::DataStruct;
@@ -24,6 +23,7 @@ use syn::Index;
 use syn::Type;
 use syn::TypeParamBound;
 use syn::Variant;
+use syn::spanned::Spanned;
 
 // Add a bound to every type parameter.
 pub(crate) fn add_trait_bounds(mut generics: Generics, bound: &TypeParamBound) -> Generics {

gazebo/gazebo_derive/src/default.rs

@@ -10,11 +10,11 @@
 use proc_macro2::TokenStream;
 use quote::quote;
 use quote::quote_spanned;
-use syn::spanned::Spanned;
 use syn::Data;
 use syn::DataStruct;
 use syn::DeriveInput;
 use syn::Fields;
+use syn::spanned::Spanned;
 
 pub fn derive_default_(input: DeriveInput) -> proc_macro::TokenStream {
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();

gazebo/gazebo_derive/src/lib.rs

@@ -13,8 +13,8 @@
 #[allow(unused_extern_crates)] // proc_macro is very special
 extern crate proc_macro;
 
-use syn::parse_macro_input;
 use syn::DeriveInput;
+use syn::parse_macro_input;
 
 mod default;
 mod variant;

gazebo/gazebo_derive/src/variant.rs

@@ -9,11 +9,11 @@
 
 use proc_macro2::Span;
 use quote::quote;
-use syn::spanned::Spanned;
 use syn::Data;
 use syn::DeriveInput;
 use syn::Fields;
 use syn::Ident;
+use syn::spanned::Spanned;
 
 pub(crate) fn derive_variant_names(input: DeriveInput) -> syn::Result<proc_macro::TokenStream> {
     if let Data::Enum(data_enum) = input.data {

gazebo/strong_hash_derive/src/lib.rs

@@ -9,11 +9,11 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::parse_macro_input;
-use syn::spanned::Spanned;
 use syn::DeriveInput;
 use syn::Fields;
 use syn::Ident;
+use syn::parse_macro_input;
+use syn::spanned::Spanned;
 
 #[proc_macro_derive(StrongHash)]
 pub fn derive_hash(input: TokenStream) -> TokenStream {

starlark/src/__derive_refs.rs

@@ -22,9 +22,9 @@
 //!  `starlark::__derive_refs::foo`.
 
 pub mod serde {
-    pub use serde::ser::Error;
     pub use serde::Serialize;
     pub use serde::Serializer;
+    pub use serde::ser::Error;
 }
 pub use inventory;
 pub mod components;

starlark/src/__derive_refs/param_spec.rs

@@ -17,11 +17,11 @@
 
 use dupe::Dupe;
 
+use crate::typing::ParamSpec;
+use crate::typing::Ty;
 use crate::typing::callable_param::ParamIsRequired;
 use crate::typing::macro_support::unpack_args_item_ty;
 use crate::typing::macro_support::unpack_kwargs_value_ty;
-use crate::typing::ParamSpec;
-use crate::typing::Ty;
 use crate::util::arc_str::ArcStr;
 use crate::values::FrozenValue;
 

starlark/src/analysis/dubious.rs

@@ -25,9 +25,9 @@ use starlark_syntax::syntax::ast::Stmt;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::codemap::FileSpan;
 use crate::codemap::Span;

starlark/src/analysis/flow.rs

@@ -26,9 +26,9 @@ use starlark_syntax::syntax::ast::Stmt;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::codemap::ResolvedFileSpan;
 use crate::codemap::Span;

starlark/src/analysis/incompatible.rs

@@ -32,9 +32,9 @@ use starlark_syntax::syntax::ast::Stmt;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::codemap::FileSpan;
 use crate::codemap::Span;

starlark/src/analysis/names.rs

@@ -23,9 +23,9 @@
 // But it does as things stand.
 
 use std::cmp;
-use std::collections::hash_map::Entry;
 use std::collections::HashMap;
 use std::collections::HashSet;
+use std::collections::hash_map::Entry;
 use std::mem;
 
 use dupe::Dupe;
@@ -46,9 +46,9 @@ use starlark_syntax::syntax::ast::Stmt;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::codemap::Span;
 use crate::codemap::Spanned;

starlark/src/analysis/performance.rs

@@ -21,9 +21,9 @@ use starlark_syntax::syntax::ast::Expr;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::syntax::AstModule;
 

starlark/src/analysis/underscore.rs

@@ -27,9 +27,9 @@ use starlark_syntax::syntax::ast::Stmt;
 use starlark_syntax::syntax::module::AstModuleFields;
 use thiserror::Error;
 
+use crate::analysis::EvalSeverity;
 use crate::analysis::types::LintT;
 use crate::analysis::types::LintWarning;
-use crate::analysis::EvalSeverity;
 use crate::codemap::CodeMap;
 use crate::syntax::AstModule;