Skip to content

Commit 01df5f5

Browse files
onethumbonethumb
committed
Apply latest cargo clippy recommendations
1 parent dad60a2 commit 01df5f5

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

‎src/bin/arch-check.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ fn aarch64_features() {
2929
println!("[AArch64] Checking for features...");
3030

3131
if is_aarch64_feature_detected!("neon") {
32-
println!(" {} NEON", checkmark);
32+
println!(" {checkmark} NEON",);
3333
} else {
3434
println!(" x NEON");
3535
}
3636

3737
if is_aarch64_feature_detected!("crc") {
38-
println!(" {} CRC", checkmark);
38+
println!(" {checkmark} CRC",);
3939
} else {
4040
println!(" x CRC");
4141
}
4242

4343
if is_aarch64_feature_detected!("sha3") {
44-
println!(" {} SHA3\n", checkmark);
44+
println!(" {checkmark} SHA3\n",);
4545
} else {
4646
println!(" x SHA3\n");
4747
}
@@ -54,43 +54,43 @@ fn x86_features() {
5454
println!("[X86] Checking for features...");
5555

5656
if is_x86_feature_detected!("sse2") {
57-
println!(" {} SSE2", checkmark);
57+
println!(" {checkmark} SSE2",);
5858
} else {
5959
println!(" x SSE2");
6060
}
6161

6262
if is_x86_feature_detected!("sse4.1") {
63-
println!(" {} SSE4.1", checkmark);
63+
println!(" {checkmark} SSE4.1",);
6464
} else {
6565
println!(" x SSE4.1");
6666
}
6767

6868
if is_x86_feature_detected!("pclmulqdq") {
69-
println!(" {} PCLMULQDQ", checkmark);
69+
println!(" {checkmark} PCLMULQDQ",);
7070
} else {
7171
println!(" x PCLMULQDQ");
7272
}
7373

7474
if is_x86_feature_detected!("avx2") {
75-
println!(" {} AVX2", checkmark);
75+
println!(" {checkmark} AVX2",);
7676
} else {
7777
println!(" x AVX2");
7878
}
7979

8080
if is_x86_feature_detected!("vpclmulqdq") {
81-
println!(" {} VPCLMULQDQ", checkmark);
81+
println!(" {checkmark} VPCLMULQDQ",);
8282
} else {
8383
println!(" x VPCLMULQDQ");
8484
}
8585

8686
if is_x86_feature_detected!("avx512f") {
87-
println!(" {} AVX512F", checkmark);
87+
println!(" {checkmark} AVX512F",);
8888
} else {
8989
println!(" x AVX512F");
9090
}
9191

9292
if is_x86_feature_detected!("avx512vl") {
93-
println!(" {} AVX512VL\n", checkmark);
93+
println!(" {checkmark} AVX512VL\n",);
9494
} else {
9595
println!(" x AVX512VL\n");
9696
}
@@ -125,7 +125,7 @@ fn print_cpu_info() {
125125
if let Ok(cpuinfo) = std::fs::read_to_string("/proc/cpuinfo") {
126126
// Split the content by double newlines and take the first entry
127127
if let Some(first_cpu) = cpuinfo.split("\n\n").next() {
128-
println!("{}", first_cpu);
128+
println!("{first_cpu}",);
129129
} else {
130130
println!("No CPU information found.");
131131
}

‎src/bin/get-custom-params.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ impl Config {
4040

4141
fn parse_hex_or_decimal(s: &str) -> Result<u64, String> {
4242
if s.starts_with("0x") || s.starts_with("0X") {
43-
u64::from_str_radix(&s[2..], 16).map_err(|_| format!("Invalid hexadecimal value: {}", s))
43+
u64::from_str_radix(&s[2..], 16).map_err(|_| format!("Invalid hexadecimal value: {s}",))
4444
} else {
4545
s.parse::<u64>()
46-
.map_err(|_| format!("Invalid decimal value: {}", s))
46+
.map_err(|_| format!("Invalid decimal value: {s}",))
4747
}
4848
}
4949

5050
fn parse_bool(s: &str) -> Result<bool, String> {
5151
match s.to_lowercase().as_str() {
5252
"true" | "1" | "yes" | "on" => Ok(true),
5353
"false" | "0" | "no" | "off" => Ok(false),
54-
_ => Err(format!("Invalid boolean value: {} (use true/false)", s)),
54+
_ => Err(format!("Invalid boolean value: {s} (use true/false)",)),
5555
}
5656
}
5757

@@ -115,7 +115,7 @@ fn parse_args(args: &[String]) -> Result<Config, String> {
115115
i += 2;
116116
}
117117
arg => {
118-
return Err(format!("Unknown argument: {}", arg));
118+
return Err(format!("Unknown argument: {arg}",));
119119
}
120120
}
121121
}
@@ -150,7 +150,7 @@ fn main() -> ExitCode {
150150
let config = match parse_args(&args) {
151151
Ok(config) => config,
152152
Err(error) => {
153-
eprintln!("Error: {}", error);
153+
eprintln!("Error: {error}",);
154154
println!();
155155
print_usage();
156156
return ExitCode::from(1);
@@ -178,7 +178,7 @@ fn main() -> ExitCode {
178178
);
179179

180180
println!();
181-
println!("// Generated CRC parameters for {}", static_name);
181+
println!("// Generated CRC parameters for {static_name}",);
182182
println!(
183183
"pub const {}: CrcParams = CrcParams {{",
184184
static_name
@@ -194,7 +194,7 @@ fn main() -> ExitCode {
194194
"Crc64"
195195
}
196196
);
197-
println!(" name: \"{}\",", static_name);
197+
println!(" name: \"{static_name}\",",);
198198
println!(" width: {},", config.width.unwrap());
199199
println!(" poly: 0x{:x},", config.polynomial.unwrap());
200200
println!(" init: 0x{:x},", config.init.unwrap());
@@ -207,7 +207,7 @@ fn main() -> ExitCode {
207207
// Print the keys array
208208
for i in 0..23 {
209209
let key = params.get_key(i);
210-
println!(" 0x{:016x},", key);
210+
println!(" 0x{key:016x},",);
211211
}
212212

213213
println!(" ]),");

‎src/enums.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ impl FromStr for CrcAlgorithm {
3737
impl Display for CrcAlgorithm {
3838
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
3939
match self {
40-
CrcAlgorithm::Crc32Aixm => write!(f, "{}", NAME_CRC32_AIXM),
41-
CrcAlgorithm::Crc32Autosar => write!(f, "{}", NAME_CRC32_AUTOSAR),
42-
CrcAlgorithm::Crc32Base91D => write!(f, "{}", NAME_CRC32_BASE91_D),
43-
CrcAlgorithm::Crc32Bzip2 => write!(f, "{}", NAME_CRC32_BZIP2),
44-
CrcAlgorithm::Crc32CdRomEdc => write!(f, "{}", NAME_CRC32_CD_ROM_EDC),
45-
CrcAlgorithm::Crc32Cksum => write!(f, "{}", NAME_CRC32_CKSUM),
40+
CrcAlgorithm::Crc32Aixm => write!(f, "{NAME_CRC32_AIXM}",),
41+
CrcAlgorithm::Crc32Autosar => write!(f, "{NAME_CRC32_AUTOSAR}",),
42+
CrcAlgorithm::Crc32Base91D => write!(f, "{NAME_CRC32_BASE91_D}",),
43+
CrcAlgorithm::Crc32Bzip2 => write!(f, "{NAME_CRC32_BZIP2}",),
44+
CrcAlgorithm::Crc32CdRomEdc => write!(f, "{NAME_CRC32_CD_ROM_EDC}",),
45+
CrcAlgorithm::Crc32Cksum => write!(f, "{NAME_CRC32_CKSUM}",),
4646
CrcAlgorithm::Crc32Custom => write!(f, "CRC-32/CUSTOM"),
47-
CrcAlgorithm::Crc32Iscsi => write!(f, "{}", NAME_CRC32_ISCSI),
48-
CrcAlgorithm::Crc32IsoHdlc => write!(f, "{}", NAME_CRC32_ISO_HDLC),
49-
CrcAlgorithm::Crc32Jamcrc => write!(f, "{}", NAME_CRC32_JAMCRC),
50-
CrcAlgorithm::Crc32Mef => write!(f, "{}", NAME_CRC32_MEF),
51-
CrcAlgorithm::Crc32Mpeg2 => write!(f, "{}", NAME_CRC32_MPEG_2),
52-
CrcAlgorithm::Crc32Xfer => write!(f, "{}", NAME_CRC32_XFER),
47+
CrcAlgorithm::Crc32Iscsi => write!(f, "{NAME_CRC32_ISCSI}",),
48+
CrcAlgorithm::Crc32IsoHdlc => write!(f, "{NAME_CRC32_ISO_HDLC}",),
49+
CrcAlgorithm::Crc32Jamcrc => write!(f, "{NAME_CRC32_JAMCRC}",),
50+
CrcAlgorithm::Crc32Mef => write!(f, "{NAME_CRC32_MEF}",),
51+
CrcAlgorithm::Crc32Mpeg2 => write!(f, "{NAME_CRC32_MPEG_2}",),
52+
CrcAlgorithm::Crc32Xfer => write!(f, "{NAME_CRC32_XFER}",),
5353
CrcAlgorithm::Crc64Custom => write!(f, "CRC-64/CUSTOM"),
54-
CrcAlgorithm::Crc64GoIso => write!(f, "{}", NAME_CRC64_GO_ISO),
55-
CrcAlgorithm::Crc64Ms => write!(f, "{}", NAME_CRC64_MS),
56-
CrcAlgorithm::Crc64Nvme => write!(f, "{}", NAME_CRC64_NVME),
57-
CrcAlgorithm::Crc64Redis => write!(f, "{}", NAME_CRC64_REDIS),
58-
CrcAlgorithm::Crc64Xz => write!(f, "{}", NAME_CRC64_XZ),
59-
CrcAlgorithm::Crc64Ecma182 => write!(f, "{}", NAME_CRC64_ECMA_182),
60-
CrcAlgorithm::Crc64We => write!(f, "{}", NAME_CRC64_WE),
54+
CrcAlgorithm::Crc64GoIso => write!(f, "{NAME_CRC64_GO_ISO}",),
55+
CrcAlgorithm::Crc64Ms => write!(f, "{NAME_CRC64_MS}",),
56+
CrcAlgorithm::Crc64Nvme => write!(f, "{NAME_CRC64_NVME}",),
57+
CrcAlgorithm::Crc64Redis => write!(f, "{NAME_CRC64_REDIS}",),
58+
CrcAlgorithm::Crc64Xz => write!(f, "{NAME_CRC64_XZ}",),
59+
CrcAlgorithm::Crc64Ecma182 => write!(f, "{NAME_CRC64_ECMA_182}",),
60+
CrcAlgorithm::Crc64We => write!(f, "{NAME_CRC64_WE}",),
6161
}
6262
}
6363
}

‎src/ffi.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ pub extern "C" fn crc_fast_get_custom_params(
468468
algorithm: match width {
469469
32 => CrcFastAlgorithm::Crc32Custom,
470470
64 => CrcFastAlgorithm::Crc64Custom,
471-
_ => panic!("Unsupported width: {}", width),
471+
_ => panic!("Unsupported width: {width}",),
472472
},
473473
width: params.width,
474474
poly: params.poly,

‎src/generate.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn keys(width: u8, poly: u64, reflected: bool) -> [u64; 23] {
6868
} else if 64 == width {
6969
CRC64_EXPONENTS
7070
} else {
71-
panic!("Unsupported width: {}", width);
71+
panic!("Unsupported width: {width}",);
7272
};
7373

7474
let poly = if 32 == width {
@@ -93,7 +93,7 @@ fn key(width: u8, poly: u64, reflected: bool, exponent: u64) -> u64 {
9393
} else if width == 64 {
9494
crc64_key(exponent, reflected, poly)
9595
} else {
96-
panic!("Unsupported width: {}", width);
96+
panic!("Unsupported width: {width}",);
9797
}
9898
}
9999

@@ -148,7 +148,7 @@ fn polynomial(width: u8, polynomial: u64, reflected: bool) -> u64 {
148148
} else if width == 64 {
149149
crc64_polynomial(polynomial, reflected)
150150
} else {
151-
panic!("Unsupported width: {}", width);
151+
panic!("Unsupported width: {width}",);
152152
}
153153
}
154154

@@ -178,7 +178,7 @@ fn mu(width: u8, polynomial: u64, reflected: bool) -> u64 {
178178
} else if width == 64 {
179179
crc64_mu(polynomial, reflected)
180180
} else {
181-
panic!("Unsupported width: {}", width);
181+
panic!("Unsupported width: {width}",);
182182
}
183183
}
184184

‎src/structs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl CrcParams {
6464
let algorithm = match width {
6565
32 => CrcAlgorithm::Crc32Custom,
6666
64 => CrcAlgorithm::Crc64Custom,
67-
_ => panic!("Unsupported width: {}", width),
67+
_ => panic!("Unsupported width: {width}",),
6868
};
6969

7070
Self {

0 commit comments

Comments
 (0)