Skip to content

Commit 44f34e8

Browse files
authored
chore(dev): group imports (#24219)
1 parent 068475e commit 44f34e8

File tree

19 files changed

+65
-59
lines changed

19 files changed

+65
-59
lines changed

lib/codecs/src/encoding/serializer.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@ use bytes::BytesMut;
44
use vector_config::configurable_component;
55
use vector_core::{config::DataType, event::Event, schema};
66

7-
use super::chunking::Chunker;
8-
use super::format::{
9-
AvroSerializer, AvroSerializerConfig, AvroSerializerOptions, CefSerializer,
10-
CefSerializerConfig, CsvSerializer, CsvSerializerConfig, GelfSerializer, GelfSerializerConfig,
11-
JsonSerializer, JsonSerializerConfig, LogfmtSerializer, LogfmtSerializerConfig,
12-
NativeJsonSerializer, NativeJsonSerializerConfig, NativeSerializer, NativeSerializerConfig,
13-
ProtobufSerializer, ProtobufSerializerConfig, RawMessageSerializer, RawMessageSerializerConfig,
14-
TextSerializer, TextSerializerConfig,
15-
};
167
#[cfg(feature = "opentelemetry")]
178
use super::format::{OtlpSerializer, OtlpSerializerConfig};
18-
use super::framing::{
19-
CharacterDelimitedEncoderConfig, FramingConfig, LengthDelimitedEncoderConfig,
20-
VarintLengthDelimitedEncoderConfig,
9+
use super::{
10+
chunking::Chunker,
11+
format::{
12+
AvroSerializer, AvroSerializerConfig, AvroSerializerOptions, CefSerializer,
13+
CefSerializerConfig, CsvSerializer, CsvSerializerConfig, GelfSerializer,
14+
GelfSerializerConfig, JsonSerializer, JsonSerializerConfig, LogfmtSerializer,
15+
LogfmtSerializerConfig, NativeJsonSerializer, NativeJsonSerializerConfig, NativeSerializer,
16+
NativeSerializerConfig, ProtobufSerializer, ProtobufSerializerConfig, RawMessageSerializer,
17+
RawMessageSerializerConfig, TextSerializer, TextSerializerConfig,
18+
},
19+
framing::{
20+
CharacterDelimitedEncoderConfig, FramingConfig, LengthDelimitedEncoderConfig,
21+
VarintLengthDelimitedEncoderConfig,
22+
},
2123
};
2224

2325
/// Serializer configuration.

src/sinks/splunk_hec/common/acknowledgements.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use hyper::Body;
22
use serde::{Deserialize, Serialize};
3-
use std::io::Write;
43
use std::{
54
collections::HashMap,
5+
io::Write,
66
num::{NonZeroU8, NonZeroU64},
77
sync::Arc,
88
time::Duration,
@@ -11,14 +11,14 @@ use tokio::sync::{mpsc::Receiver, oneshot::Sender};
1111
use vector_lib::{configurable::configurable_component, event::EventStatus};
1212

1313
use super::service::{HttpRequestBuilder, MetadataFields};
14-
use crate::sinks::util::Compressor;
1514
use crate::{
1615
config::AcknowledgementsConfig,
1716
http::HttpClient,
1817
internal_events::{
1918
SplunkIndexerAcknowledgementAPIError, SplunkIndexerAcknowledgementAckAdded,
2019
SplunkIndexerAcknowledgementAcksRemoved,
2120
},
21+
sinks::util::Compressor,
2222
};
2323

2424
/// Splunk HEC acknowledgement configuration.

tests/e2e/opentelemetry/logs/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use vector_lib::opentelemetry::proto::LOGS_REQUEST_MESSAGE_TYPE;
2-
use vector_lib::opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest;
3-
use vector_lib::opentelemetry::proto::common::v1::any_value::Value as AnyValueEnum;
1+
use vector_lib::opentelemetry::proto::{
2+
LOGS_REQUEST_MESSAGE_TYPE, collector::logs::v1::ExportLogsServiceRequest,
3+
common::v1::any_value::Value as AnyValueEnum,
4+
};
45

56
use crate::opentelemetry::{
67
assert_service_name_with, parse_line_to_export_type_request, read_file_helper,

tests/e2e/opentelemetry/metrics/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use crate::opentelemetry::{
22
assert_service_name_with, parse_line_to_export_type_request, read_file_helper,
33
};
44

5-
use vector_lib::opentelemetry::proto::METRICS_REQUEST_MESSAGE_TYPE;
6-
use vector_lib::opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest;
7-
use vector_lib::opentelemetry::proto::common::v1::KeyValue;
8-
use vector_lib::opentelemetry::proto::common::v1::any_value::Value as AnyValueEnum;
9-
use vector_lib::opentelemetry::proto::metrics::v1::metric::Data as MetricData;
10-
use vector_lib::opentelemetry::proto::metrics::v1::{Gauge, Sum};
5+
use vector_lib::opentelemetry::proto::{
6+
METRICS_REQUEST_MESSAGE_TYPE,
7+
collector::metrics::v1::ExportMetricsServiceRequest,
8+
common::v1::{KeyValue, any_value::Value as AnyValueEnum},
9+
metrics::v1::{Gauge, Sum, metric::Data as MetricData},
10+
};
1111

1212
const EXPECTED_METRIC_COUNT: usize = 400; // 200 via gRPC + 200 via HTTP (50 of each type: Gauge, Sum, Histogram, ExponentialHistogram)
1313

vdev/src/commands/build/publish_metadata.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ use anyhow::Result;
22
use chrono::prelude::*;
33

44
use crate::utils::{cargo, git};
5-
use std::env;
6-
use std::fs::OpenOptions;
7-
use std::io::{self, Write};
5+
use std::{
6+
env,
7+
fs::OpenOptions,
8+
io::{self, Write},
9+
};
810

911
/// Setting necessary metadata for our publish workflow in CI.
1012
///

vdev/src/commands/check/markdown.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use anyhow::Result;
22

3-
use crate::app;
4-
use crate::utils::git::git_ls_files;
3+
use crate::{app, utils::git::git_ls_files};
54

65
/// Check that markdown is styled properly
76
#[derive(clap::Args, Debug)]

vdev/src/commands/check/rust.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
use anyhow::Result;
22
use std::ffi::OsString;
33

4-
use crate::{app, utils::command::ChainArgs as _, utils::git};
4+
use crate::{
5+
app,
6+
utils::{command::ChainArgs as _, git},
7+
};
58

69
/// Check the Rust code for errors
710
#[derive(clap::Args, Debug)]

vdev/src/commands/crate_versions.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use std::{collections::HashMap, collections::HashSet, process::Command};
1+
use std::{
2+
collections::{HashMap, HashSet},
3+
process::Command,
4+
};
25

36
use anyhow::Result;
47
use clap::Args;

vdev/src/commands/e2e/show.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
use crate::commands::compose_tests::show::{exec, exec_environments_only};
2-
use crate::testing::config::E2E_TESTS_DIR;
1+
use crate::{
2+
commands::compose_tests::show::{exec, exec_environments_only},
3+
testing::config::E2E_TESTS_DIR,
4+
};
35
use anyhow::Result;
46
use clap::Args;
57

vdev/src/commands/info.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use anyhow::Result;
22
use clap::Args;
33

4-
use crate::testing::docker::CONTAINER_TOOL;
5-
use crate::{app, utils::platform};
4+
use crate::{app, testing::docker::CONTAINER_TOOL, utils::platform};
65

76
/// Show `vdev` command configuration
87
#[derive(Args, Debug)]

0 commit comments

Comments
 (0)