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

src/audit_sec.rs

@@ -8,14 +8,14 @@
 use std::io::Write;
 
 use anyhow::Context;
-use rustsec::advisory::Informational;
-use rustsec::report::Report;
-use rustsec::report::Settings;
 use rustsec::Database;
 use rustsec::Lockfile;
 use rustsec::Repository;
 use rustsec::Warning;
 use rustsec::WarningKind;
+use rustsec::advisory::Informational;
+use rustsec::report::Report;
+use rustsec::report::Settings;
 use termcolor::Color;
 use termcolor::ColorChoice;
 use termcolor::ColorSpec;

src/buck.rs

@@ -18,10 +18,10 @@ use std::io::Write;
 use std::path::PathBuf;
 
 use semver::Version;
+use serde::Serialize;
 use serde::ser::SerializeMap;
 use serde::ser::SerializeSeq;
 use serde::ser::Serializer;
-use serde::Serialize;
 use serde_starlark::FunctionCall;
 
 use crate::collection::SelectSet;

src/buckify.rs

@@ -19,16 +19,18 @@ use std::io::Write;
 use std::path::Component;
 use std::path::Path;
 use std::path::PathBuf;
-use std::sync::mpsc;
 use std::sync::Mutex;
+use std::sync::mpsc;
 
-use anyhow::bail;
 use anyhow::Context;
+use anyhow::bail;
 use cached::proc_macro::cached;
 use fnv::FnvHasher;
 use itertools::Itertools;
 use url::Url;
 
+use crate::Args;
+use crate::Paths;
 use crate::buck;
 use crate::buck::Alias;
 use crate::buck::BuckPath;
@@ -47,14 +49,14 @@ use crate::buck::RustLibrary;
 use crate::buck::StringOrPath;
 use crate::buck::SubtargetOrPath;
 use crate::buck::Visibility;
-use crate::cargo::cargo_get_lockfile_and_metadata;
 use crate::cargo::ArtifactKind;
 use crate::cargo::Edition;
 use crate::cargo::Manifest;
 use crate::cargo::ManifestTarget;
 use crate::cargo::PkgId;
 use crate::cargo::Source;
 use crate::cargo::TargetReq;
+use crate::cargo::cargo_get_lockfile_and_metadata;
 use crate::collection::SetOrMap;
 use crate::config::Config;
 use crate::config::VendorConfig;
@@ -65,13 +67,11 @@ use crate::glob::NO_EXCLUDE;
 use crate::index;
 use crate::lockfile::Lockfile;
 use crate::lockfile::LockfilePackage;
-use crate::platform::platform_names_for_expr;
 use crate::platform::PlatformExpr;
 use crate::platform::PlatformName;
+use crate::platform::platform_names_for_expr;
 use crate::srcfiles::crate_srcfiles;
 use crate::universe::UniverseName;
-use crate::Args;
-use crate::Paths;
 
 // normalize a/b/../c => a/c and a/./b => a/b
 pub fn normalize_path(path: &Path) -> PathBuf {

src/cargo.rs

@@ -24,17 +24,17 @@ use std::process::Stdio;
 use std::thread;
 
 use anyhow::Context;
-use serde::de::DeserializeOwned;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 
+use crate::Args;
+use crate::Paths;
 use crate::config::Config;
 use crate::config::VendorConfig;
 use crate::lockfile::Lockfile;
 use crate::platform::PlatformExpr;
-use crate::Args;
-use crate::Paths;
 
 pub fn cargo_get_lockfile_and_metadata(
     config: &Config,
@@ -713,8 +713,8 @@ fn parse_source(source: &str) -> Option<Source> {
 
 #[cfg(test)]
 mod test {
-    use super::parse_source;
     use super::Source;
+    use super::parse_source;
 
     #[test]
     fn test_parses_source_git() {

src/cfg.rs

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+use nom::IResult;
 use nom::branch::alt;
 use nom::bytes::complete::escaped;
 use nom::bytes::complete::tag;
@@ -18,9 +19,9 @@ use nom::combinator::map;
 use nom::combinator::opt;
 use nom::combinator::recognize;
 use nom::combinator::verify;
-use nom::error::context;
 use nom::error::ContextError;
 use nom::error::ParseError;
+use nom::error::context;
 use nom::multi::many0_count;
 use nom::multi::separated_list0;
 use nom::multi::separated_list1;
@@ -29,7 +30,6 @@ use nom::sequence::pair;
 use nom::sequence::preceded;
 use nom::sequence::separated_pair;
 use nom::sequence::terminated;
-use nom::IResult;
 use unicode_ident::is_xid_continue;
 use unicode_ident::is_xid_start;
 

src/collection.rs

@@ -10,13 +10,13 @@ use std::collections::BTreeSet;
 use std::fmt;
 use std::marker::PhantomData;
 
-use serde::de::value::MapAccessDeserializer;
-use serde::de::value::SeqAccessDeserializer;
 use serde::de::Deserialize;
 use serde::de::Deserializer;
 use serde::de::MapAccess;
 use serde::de::SeqAccess;
 use serde::de::Visitor;
+use serde::de::value::MapAccessDeserializer;
+use serde::de::value::SeqAccessDeserializer;
 use serde::ser::Serialize;
 use serde::ser::SerializeSeq;
 use serde::ser::SerializeTupleStruct;

src/config.rs

@@ -24,12 +24,12 @@ use std::path::PathBuf;
 
 use anyhow::Context;
 use monostate::MustBe;
-use serde::de::value::MapAccessDeserializer;
+use serde::Deserialize;
+use serde::Serialize;
 use serde::de::Deserializer;
 use serde::de::MapAccess;
 use serde::de::Visitor;
-use serde::Deserialize;
-use serde::Serialize;
+use serde::de::value::MapAccessDeserializer;
 
 use crate::platform::PlatformConfig;
 use crate::platform::PlatformName;

src/fixups.rs

@@ -16,10 +16,11 @@ use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
 
+use anyhow::Context;
 use anyhow::anyhow;
 use anyhow::bail;
-use anyhow::Context;
 
+use crate::Paths;
 use crate::buck;
 use crate::buck::Alias;
 use crate::buck::BuckPath;
@@ -44,14 +45,13 @@ use crate::collection::SetOrMap;
 use crate::config::Config;
 use crate::config::VendorConfig;
 use crate::glob::Globs;
-use crate::glob::SerializableGlobSet as GlobSet;
 use crate::glob::NO_EXCLUDE;
+use crate::glob::SerializableGlobSet as GlobSet;
 use crate::index::Index;
 use crate::index::ResolvedDep;
-use crate::platform::platform_names_for_expr;
 use crate::platform::PlatformExpr;
 use crate::platform::PlatformPredicate;
-use crate::Paths;
+use crate::platform::platform_names_for_expr;
 
 mod buildscript;
 mod config;

src/fixups/buildscript.rs

@@ -11,14 +11,14 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::path::PathBuf;
 
-use serde::de::Error as DeError;
-use serde::de::MapAccess;
-use serde::de::Visitor;
-use serde::ser::SerializeMap;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
 use serde::Serializer;
+use serde::de::Error as DeError;
+use serde::de::MapAccess;
+use serde::de::Visitor;
+use serde::ser::SerializeMap;
 
 use crate::cargo::TargetKind;
 use crate::collection::SetOrMap;

src/fixups/config.rs

@@ -12,13 +12,13 @@ use std::fmt;
 use std::path::Path;
 use std::path::PathBuf;
 
-use serde::de::value::SeqAccessDeserializer;
-use serde::de::SeqAccess;
-use serde::de::Visitor;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
 use serde::Serializer;
+use serde::de::SeqAccess;
+use serde::de::Visitor;
+use serde::de::value::SeqAccessDeserializer;
 use strum::IntoEnumIterator as _;
 use walkdir::WalkDir;