chore(dev): format/merge imports with nightly rustfmt options (#23730)

* chore(dev): format/merge imports with nightly rustfmt options

* revert fmt toml config changes

Author: pront

benches/codecs/encoder.rs

@@ -7,8 +7,11 @@ use criterion::{
 };
 use tokio_util::codec::Encoder;
 use vector::event::{Event, LogEvent};
-use vector_lib::codecs::{JsonSerializerConfig, NewlineDelimitedEncoder, encoding::Framer};
-use vector_lib::{btreemap, byte_size_of::ByteSizeOf};
+use vector_lib::{
+    btreemap,
+    byte_size_of::ByteSizeOf,
+    codecs::{JsonSerializerConfig, NewlineDelimitedEncoder, encoding::Framer},
+};
 
 #[derive(Debug, Clone)]
 pub struct JsonLogSerializer;

benches/codecs/newline_bytes.rs

@@ -7,7 +7,8 @@ use criterion::{
 };
 use tokio_util::codec::Decoder;
 use vector_lib::codecs::{
-    BytesDeserializer, NewlineDelimitedDecoder, decoding::Deserializer, decoding::Framer,
+    BytesDeserializer, NewlineDelimitedDecoder,
+    decoding::{Deserializer, Framer},
 };
 
 #[derive(Debug)]

benches/distribution_statistic.rs

@@ -1,6 +1,8 @@
 use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
-use rand::distr::Distribution;
-use rand::{distr::Uniform, seq::SliceRandom};
+use rand::{
+    distr::{Distribution, Uniform},
+    seq::SliceRandom,
+};
 use vector::{event::metric::Sample, sinks::util::statistic::DistributionStatistic};
 
 fn generate_samples(mut size: u32, max_bin_count: u32) -> Vec<Sample> {

benches/dnstap/mod.rs

@@ -1,5 +1,4 @@
-use base64::Engine;
-use base64::engine::general_purpose::STANDARD;
+use base64::{Engine, engine::general_purpose::STANDARD};
 use bytes::Bytes;
 use criterion::{BatchSize, Criterion, Throughput, criterion_group, criterion_main};
 use dnsmsg_parser::dns_message_parser::DnsParserOptions;

benches/enrichment_tables.rs

@@ -2,10 +2,9 @@ use std::time::SystemTime;
 
 use chrono::prelude::*;
 use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
-use vector::enrichment_tables::file::FileData;
 use vector::enrichment_tables::{
     Condition, Table,
-    file::File,
+    file::{File, FileData},
     geoip::{Geoip, GeoipConfig},
     mmdb::{Mmdb, MmdbConfig},
 };

benches/remap.rs

@@ -10,8 +10,7 @@ use vector::{
         remap::{Remap, RemapConfig},
     },
 };
-use vrl::event_path;
-use vrl::prelude::*;
+use vrl::{event_path, prelude::*};
 
 criterion_group!(
     name = benches;

benches/template.rs

@@ -2,7 +2,10 @@ use std::convert::TryFrom;
 
 use chrono::Utc;
 use criterion::{BatchSize, Criterion, criterion_group};
-use vector::{config::log_schema, event::Event, event::LogEvent};
+use vector::{
+    config::log_schema,
+    event::{Event, LogEvent},
+};
 
 fn bench_elasticsearch_index(c: &mut Criterion) {
     use vector::template::Template;

benches/transform/dedupe.rs

@@ -1,16 +1,19 @@
 use core::fmt;
 use std::{num::NonZeroUsize, time::Duration};
 
-use crate::common::{FixedLogStream, consume};
 use criterion::{
     BatchSize, BenchmarkGroup, BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group,
     measurement::WallTime,
 };
-use vector::transforms::dedupe::common::{CacheConfig, FieldMatchConfig, TimedCacheConfig};
-use vector::transforms::dedupe::config::DedupeConfig;
-use vector::transforms::dedupe::transform::Dedupe;
+use vector::transforms::dedupe::{
+    common::{CacheConfig, FieldMatchConfig, TimedCacheConfig},
+    config::DedupeConfig,
+    transform::Dedupe,
+};
 use vector_lib::transform::Transform;
 
+use crate::common::{FixedLogStream, consume};
+
 #[derive(Debug)]
 struct Param {
     slug: &'static str,

benches/transform/reduce.rs

@@ -1,16 +1,16 @@
 use core::fmt;
 use std::{num::NonZeroUsize, time::Duration};
 
-use crate::common::{FixedLogStream, consume};
 use criterion::{
     BatchSize, BenchmarkGroup, BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group,
     measurement::WallTime,
 };
 use indexmap::IndexMap;
-use vector::transforms::reduce::config::ReduceConfig;
-use vector::transforms::reduce::transform::Reduce;
+use vector::transforms::reduce::{config::ReduceConfig, transform::Reduce};
 use vector_lib::transform::Transform;
 
+use crate::common::{FixedLogStream, consume};
+
 #[derive(Debug)]
 struct Param {
     slug: &'static str,

benches/transform/route.rs

@@ -6,10 +6,12 @@ use criterion::{
     BatchSize, BenchmarkGroup, BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group,
     measurement::WallTime,
 };
-use vector::config::TransformContext;
-use vector::transforms::{
-    TransformOutputsBuf,
-    route::{Route, RouteConfig},
+use vector::{
+    config::TransformContext,
+    transforms::{
+        TransformOutputsBuf,
+        route::{Route, RouteConfig},
+    },
 };
 use vector_lib::{
     config::{DataType, TransformOutput},