Skip to content

Commit 42b0168

Browse files
diliopfacebook-github-bot
authored andcommitted
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
1 parent 11e6b28 commit 42b0168

47 files changed

Lines changed: 106 additions & 106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

below/below_derive/src/helper.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// limitations under the License.
1414

1515
use quote::ToTokens;
16-
use syn::parse::Parse;
17-
use syn::punctuated::Punctuated;
18-
use syn::spanned::Spanned;
1916
use syn::Attribute;
2017
use syn::Ident;
2118
use syn::Token;
19+
use syn::parse::Parse;
20+
use syn::punctuated::Punctuated;
21+
use syn::spanned::Spanned;
2222

2323
/// Adapted from strum_macros
2424
pub fn get_metadata<'a, T: Parse + Spanned>(

below/below_derive/src/qenum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
use proc_macro2::Span;
2626
use proc_macro2::TokenStream;
2727
use quote::quote;
28-
use syn::spanned::Spanned;
2928
use syn::DeriveInput;
3029
use syn::LitStr;
30+
use syn::spanned::Spanned;
3131

3232
use crate::helper::to_snakecase;
3333

below/below_derive/src/queriable.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
use proc_macro2::Span;
1616
use proc_macro2::TokenStream;
1717
use quote::quote;
18-
use syn::parse::Parse;
19-
use syn::parse::ParseStream;
20-
use syn::spanned::Spanned;
2118
use syn::DeriveInput;
2219
use syn::Field;
2320
use syn::Ident;
2421
use syn::Token;
22+
use syn::parse::Parse;
23+
use syn::parse::ParseStream;
24+
use syn::spanned::Spanned;
2525

2626
use crate::helper::get_metadata;
2727
use crate::helper::occurrence_error;

below/btrfs/src/btrfs_api/sudotest.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ use std::os::unix::fs::MetadataExt;
1919
use std::os::unix::io::AsRawFd;
2020
use std::path::Path;
2121

22-
#[cfg(fbcode_build)]
23-
pub use btrfs::btrfs_api::*;
2422
#[cfg(fbcode_build)]
2523
use btrfs::BtrfsReader;
24+
#[cfg(fbcode_build)]
25+
pub use btrfs::btrfs_api::*;
2626
use common::logutil::get_logger;
27-
use nix::sys::statfs::fstatfs;
2827
use nix::sys::statfs::FsType;
28+
use nix::sys::statfs::fstatfs;
2929
use openat::Dir;
3030

31-
#[cfg(not(fbcode_build))]
32-
pub use crate::btrfs_api::*;
3331
#[cfg(not(fbcode_build))]
3432
use crate::BtrfsReader;
33+
#[cfg(not(fbcode_build))]
34+
pub use crate::btrfs_api::*;
3535

3636
// Currently, sudotests test basic functionality. Will testing infrastructure in later commits
3737

below/cgroupfs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ use std::path::Path;
2828
use std::path::PathBuf;
2929
use std::str::FromStr;
3030

31-
use nix::sys::statfs::fstatfs;
3231
use nix::sys::statfs::CGROUP2_SUPER_MAGIC;
32+
use nix::sys::statfs::fstatfs;
3333
use openat::AsPath;
3434
use openat::Dir;
3535
use openat::SimpleType;

below/common/src/cliutil.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ use std::time::Duration;
1616
use std::time::SystemTime;
1717
use std::time::UNIX_EPOCH;
1818

19+
use anyhow::Result;
1920
use anyhow::anyhow;
2021
use anyhow::bail;
21-
use anyhow::Result;
2222

2323
use crate::dateutil;
2424
use crate::util;

below/common/src/dateutil.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ use std::sync::atomic::AtomicI32;
3030
use std::sync::atomic::Ordering;
3131
use std::time::SystemTime;
3232

33-
use chrono::prelude::*;
3433
use chrono::Duration;
3534
use chrono::Local;
3635
use chrono::NaiveDateTime;
3736
use chrono::NaiveTime;
3837
use chrono::TimeZone;
38+
use chrono::prelude::*;
3939
use regex::Regex;
4040

4141
/// A simple time structure that matches hg's time representation.

below/config/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use std::path::Path;
1919
use std::path::PathBuf;
2020
use std::sync::OnceLock;
2121

22-
use anyhow::bail;
2322
use anyhow::Result;
23+
use anyhow::bail;
2424
use serde::Deserialize;
2525
use serde::Serialize;
2626

below/dump/src/command.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
use std::fmt::Display;
1616
use std::str::FromStr;
1717

18-
use anyhow::bail;
1918
use anyhow::Error;
2019
use anyhow::Result;
20+
use anyhow::bail;
2121
use clap::Parser;
2222
use model::BtrfsModelFieldId;
2323
use model::FieldId;

below/dump/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ use std::str::FromStr;
2424
use std::sync::mpsc::Receiver;
2525
use std::time::SystemTime;
2626

27-
use anyhow::bail;
2827
use anyhow::Context;
2928
use anyhow::Error;
3029
use anyhow::Result;
30+
use anyhow::bail;
3131
use common::cliutil;
3232
use common::util::get_belowrc_dump_section_key;
3333
use common::util::get_belowrc_filename;
3434
use common::util::timestamp_to_datetime;
3535
use model::Field;
3636
use model::FieldId;
3737
use model::Queriable;
38-
use serde_json::json;
3938
use serde_json::Value;
40-
use store::advance::new_advance_local;
41-
use store::advance::new_advance_remote;
39+
use serde_json::json;
4240
use store::Advance;
4341
use store::Direction;
42+
use store::advance::new_advance_local;
43+
use store::advance::new_advance_remote;
4444
use tar::Archive;
4545
use tempfile::TempDir;
4646
use toml::value::Value as TValue;
@@ -62,14 +62,14 @@ pub mod transport;
6262
#[cfg(test)]
6363
mod test;
6464

65-
use command::expand_fields;
6665
pub use command::DumpCommand;
6766
use command::GeneralOpt;
6867
use command::OutputFormat;
68+
use command::expand_fields;
6969
use render::HasRenderConfigForDump;
70-
use tmain::dump_timeseries;
7170
use tmain::Dumper;
7271
use tmain::IterExecResult;
72+
use tmain::dump_timeseries;
7373

7474
/// Fields available to all commands. Each enum represents some semantics and
7575
/// knows how to extract relevant data from a CommonFieldContext.

0 commit comments

Comments
 (0)