Skip to content

Commit b29656e

Browse files
Merge branch 'main' into merge-flattening-code
2 parents 3cab265 + 1c001c8 commit b29656e

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

src/cli.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@ use crate::{
2727
storage::{AzureBlobConfig, FSConfig, S3Config},
2828
};
2929

30-
#[cfg(any(
31-
all(target_os = "linux", target_arch = "x86_64"),
32-
all(target_os = "macos", target_arch = "aarch64")
33-
))]
34-
use crate::kafka::SslProtocol as KafkaSslProtocol;
35-
36-
#[cfg(not(any(
37-
all(target_os = "linux", target_arch = "x86_64"),
38-
all(target_os = "macos", target_arch = "aarch64")
39-
)))]
40-
use std::string::String as KafkaSslProtocol;
41-
4230
/// Default username and password for Parseable server, used by default for local mode.
4331
/// NOTE: obviously not recommended for production
4432
pub const DEFAULT_USERNAME: &str = "admin";
@@ -344,7 +332,7 @@ pub struct Options {
344332
value_parser = validation::kafka_security_protocol,
345333
help = "Kafka security protocol"
346334
)]
347-
pub kafka_security_protocol: Option<KafkaSslProtocol>,
335+
pub kafka_security_protocol: Option<crate::kafka::SslProtocol>,
348336

349337
#[cfg(any(
350338
all(target_os = "linux", target_arch = "x86_64"),

0 commit comments

Comments
 (0)