Skip to content

Commit 7bf086f

Browse files
TwinklebearTwinklebear
committed
apply clippy update
1 parent cfefcec commit 7bf086f

File tree

1 file changed

+77
-77
lines changed

1 file changed

+77
-77
lines changed

‎compile/src/opt.rs

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ pub enum MathLib {
1313
System,
1414
}
1515

16-
impl ToString for MathLib {
17-
fn to_string(&self) -> String {
16+
impl std::fmt::Display for MathLib {
17+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
1818
match *self {
19-
MathLib::ISPCDefault => String::from("--math-lib=default"),
20-
MathLib::Fast => String::from("--math-lib=fast"),
21-
MathLib::SVML => String::from("--math-lib=svml"),
22-
MathLib::System => String::from("--math-lib=system"),
19+
MathLib::ISPCDefault => write!(f, "--math-lib=default"),
20+
MathLib::Fast => write!(f, "--math-lib=fast"),
21+
MathLib::SVML => write!(f, "--math-lib=svml"),
22+
MathLib::System => write!(f, "--math-lib=system"),
2323
}
2424
}
2525
}
@@ -32,13 +32,13 @@ pub enum Architecture {
3232
X64,
3333
}
3434

35-
impl ToString for Architecture {
36-
fn to_string(&self) -> String {
35+
impl std::fmt::Display for Architecture {
36+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
3737
match *self {
38-
Architecture::Arm => String::from("--arch=arm"),
39-
Architecture::Aarch64 => String::from("--arch=aarch64"),
40-
Architecture::X86 => String::from("--arch=x86"),
41-
Architecture::X64 => String::from("--arch=x86_64"),
38+
Architecture::Arm => write!(f, "--arch=arm"),
39+
Architecture::Aarch64 => write!(f, "--arch=aarch64"),
40+
Architecture::X86 => write!(f, "--arch=x86"),
41+
Architecture::X64 => write!(f, "--arch=x86_64"),
4242
}
4343
}
4444
}
@@ -53,11 +53,11 @@ pub enum Addressing {
5353
A64,
5454
}
5555

56-
impl ToString for Addressing {
57-
fn to_string(&self) -> String {
56+
impl std::fmt::Display for Addressing {
57+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
5858
match *self {
59-
Addressing::A32 => String::from("--addressing=32"),
60-
Addressing::A64 => String::from("--addressing=64"),
59+
Addressing::A32 => write!(f, "--addressing=32"),
60+
Addressing::A64 => write!(f, "--addressing=64"),
6161
}
6262
}
6363
}
@@ -94,28 +94,28 @@ pub enum CPU {
9494
CoretexA57,
9595
}
9696

97-
impl ToString for CPU {
98-
fn to_string(&self) -> String {
97+
impl std::fmt::Display for CPU {
98+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
9999
match *self {
100-
CPU::Generic => String::from("--cpu=generic"),
101-
CPU::Bonnell => String::from("--cpu=bonnell"),
102-
CPU::Core2 => String::from("--cpu=core2"),
103-
CPU::Penryn => String::from("--cpu=penryn"),
104-
CPU::Nehalem => String::from("--cpu=nehalem"),
105-
CPU::Ps4 => String::from("--cpu=ps4"),
106-
CPU::SandyBridge => String::from("--cpu=sandybridge"),
107-
CPU::IvyBridge => String::from("--cpu=ivybridge"),
108-
CPU::Haswell => String::from("--cpu=haswell"),
109-
CPU::Broadwell => String::from("--cpu=broadwell"),
110-
CPU::Knl => String::from("--cpu=knl"),
111-
CPU::Skx => String::from("--cpu=skx"),
112-
CPU::Icl => String::from("--cpu=icl"),
113-
CPU::Silvermont => String::from("--cpu=silvermont"),
114-
CPU::CoretexA15 => String::from("--cpu=cortex-a15"),
115-
CPU::CoretexA9 => String::from("--cpu=cortex-a9"),
116-
CPU::CoretexA35 => String::from("--cpu=cortex-a35"),
117-
CPU::CoretexA53 => String::from("--cpu=cortex-a53"),
118-
CPU::CoretexA57 => String::from("--cpu=cortex-a57"),
100+
CPU::Generic => write!(f, "--cpu=generic"),
101+
CPU::Bonnell => write!(f, "--cpu=bonnell"),
102+
CPU::Core2 => write!(f, "--cpu=core2"),
103+
CPU::Penryn => write!(f, "--cpu=penryn"),
104+
CPU::Nehalem => write!(f, "--cpu=nehalem"),
105+
CPU::Ps4 => write!(f, "--cpu=ps4"),
106+
CPU::SandyBridge => write!(f, "--cpu=sandybridge"),
107+
CPU::IvyBridge => write!(f, "--cpu=ivybridge"),
108+
CPU::Haswell => write!(f, "--cpu=haswell"),
109+
CPU::Broadwell => write!(f, "--cpu=broadwell"),
110+
CPU::Knl => write!(f, "--cpu=knl"),
111+
CPU::Skx => write!(f, "--cpu=skx"),
112+
CPU::Icl => write!(f, "--cpu=icl"),
113+
CPU::Silvermont => write!(f, "--cpu=silvermont"),
114+
CPU::CoretexA15 => write!(f, "--cpu=cortex-a15"),
115+
CPU::CoretexA9 => write!(f, "--cpu=cortex-a9"),
116+
CPU::CoretexA35 => write!(f, "--cpu=cortex-a35"),
117+
CPU::CoretexA53 => write!(f, "--cpu=cortex-a53"),
118+
CPU::CoretexA57 => write!(f, "--cpu=cortex-a57"),
119119
}
120120
}
121121
}
@@ -139,16 +139,16 @@ pub enum OptimizationOpt {
139139
DisableZmm,
140140
}
141141

142-
impl ToString for OptimizationOpt {
143-
fn to_string(&self) -> String {
142+
impl std::fmt::Display for OptimizationOpt {
143+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
144144
match *self {
145-
OptimizationOpt::DisableAssertions => String::from("--opt=disable-assertions"),
146-
OptimizationOpt::DisableFMA => String::from("--opt=disable-fma"),
147-
OptimizationOpt::DisableLoopUnroll => String::from("--opt=disable-loop-unroll"),
148-
OptimizationOpt::FastMaskedVload => String::from("--opt=fast-masked-vload"),
149-
OptimizationOpt::FastMath => String::from("--opt=fast-math"),
150-
OptimizationOpt::ForceAlignedMemory => String::from("--opt=force-aligned-memory"),
151-
OptimizationOpt::DisableZmm => String::from("--opt=disable-zmm"),
145+
OptimizationOpt::DisableAssertions => write!(f, "--opt=disable-assertions"),
146+
OptimizationOpt::DisableFMA => write!(f, "--opt=disable-fma"),
147+
OptimizationOpt::DisableLoopUnroll => write!(f, "--opt=disable-loop-unroll"),
148+
OptimizationOpt::FastMaskedVload => write!(f, "--opt=fast-masked-vload"),
149+
OptimizationOpt::FastMath => write!(f, "--opt=fast-math"),
150+
OptimizationOpt::ForceAlignedMemory => write!(f, "--opt=force-aligned-memory"),
151+
OptimizationOpt::DisableZmm => write!(f, "--opt=disable-zmm"),
152152
}
153153
}
154154
}
@@ -208,30 +208,30 @@ impl TargetISA {
208208
}
209209
}
210210

211-
impl ToString for TargetISA {
212-
fn to_string(&self) -> String {
211+
impl std::fmt::Display for TargetISA {
212+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
213213
match *self {
214-
TargetISA::Host => String::from("host"),
215-
TargetISA::SSE2i32x4 => String::from("sse2-i32x4"),
216-
TargetISA::SSE2i32x8 => String::from("sse2-i32x8"),
217-
TargetISA::SSE4i32x4 => String::from("sse4-i32x4"),
218-
TargetISA::SSE4i32x8 => String::from("sse4-i32x8"),
219-
TargetISA::SSE4i16x8 => String::from("sse4-i16x8"),
220-
TargetISA::SSE4i8x16 => String::from("sse4-i8x16"),
221-
TargetISA::AVX1i32x4 => String::from("avx1-i32x4"),
222-
TargetISA::AVX1i32x8 => String::from("avx1-i32x8"),
223-
TargetISA::AVX1i32x16 => String::from("avx1-i32x16"),
224-
TargetISA::AVX1i64x4 => String::from("avx1-i64x4"),
225-
TargetISA::AVX2i32x8 => String::from("avx2-i32x8"),
226-
TargetISA::AVX2i32x16 => String::from("avx2-i32x16"),
227-
TargetISA::AVX2i64x4 => String::from("avx2-i64x4"),
228-
TargetISA::AVX512KNLi32x16 => String::from("avx512knl-i32x16"),
229-
TargetISA::AVX512SKXi32x16 => String::from("avx512skx-i32x16"),
230-
TargetISA::AVX512SKXi32x8 => String::from("avx512skx-i32x8"),
231-
TargetISA::Neoni8x16 => String::from("neon-i8x16"),
232-
TargetISA::Neoni16x8 => String::from("neon-i16x8"),
233-
TargetISA::Neoni32x4 => String::from("neon-i32x4"),
234-
TargetISA::Neoni32x8 => String::from("neon-i32x8"),
214+
TargetISA::Host => write!(f, "host"),
215+
TargetISA::SSE2i32x4 => write!(f, "sse2-i32x4"),
216+
TargetISA::SSE2i32x8 => write!(f, "sse2-i32x8"),
217+
TargetISA::SSE4i32x4 => write!(f, "sse4-i32x4"),
218+
TargetISA::SSE4i32x8 => write!(f, "sse4-i32x8"),
219+
TargetISA::SSE4i16x8 => write!(f, "sse4-i16x8"),
220+
TargetISA::SSE4i8x16 => write!(f, "sse4-i8x16"),
221+
TargetISA::AVX1i32x4 => write!(f, "avx1-i32x4"),
222+
TargetISA::AVX1i32x8 => write!(f, "avx1-i32x8"),
223+
TargetISA::AVX1i32x16 => write!(f, "avx1-i32x16"),
224+
TargetISA::AVX1i64x4 => write!(f, "avx1-i64x4"),
225+
TargetISA::AVX2i32x8 => write!(f, "avx2-i32x8"),
226+
TargetISA::AVX2i32x16 => write!(f, "avx2-i32x16"),
227+
TargetISA::AVX2i64x4 => write!(f, "avx2-i64x4"),
228+
TargetISA::AVX512KNLi32x16 => write!(f, "avx512knl-i32x16"),
229+
TargetISA::AVX512SKXi32x16 => write!(f, "avx512skx-i32x16"),
230+
TargetISA::AVX512SKXi32x8 => write!(f, "avx512skx-i32x8"),
231+
TargetISA::Neoni8x16 => write!(f, "neon-i8x16"),
232+
TargetISA::Neoni16x8 => write!(f, "neon-i16x8"),
233+
TargetISA::Neoni32x4 => write!(f, "neon-i32x4"),
234+
TargetISA::Neoni32x8 => write!(f, "neon-i32x8"),
235235
}
236236
}
237237
}
@@ -260,15 +260,15 @@ impl TargetOS {
260260
}
261261
}
262262

263-
impl ToString for TargetOS {
264-
fn to_string(&self) -> String {
263+
impl std::fmt::Display for TargetOS {
264+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
265265
match *self {
266-
TargetOS::Windows => String::from("--target-os=windows"),
267-
TargetOS::Ps4 => String::from("--target-os=ps4"),
268-
TargetOS::Linux => String::from("--target-os=linux"),
269-
TargetOS::Macos => String::from("--target-os=macos"),
270-
TargetOS::Android => String::from("--target-os=android"),
271-
TargetOS::Ios => String::from("--target-os=ios"),
266+
TargetOS::Windows => write!(f, "--target-os=windows"),
267+
TargetOS::Ps4 => write!(f, "--target-os=ps4"),
268+
TargetOS::Linux => write!(f, "--target-os=linux"),
269+
TargetOS::Macos => write!(f, "--target-os=macos"),
270+
TargetOS::Android => write!(f, "--target-os=android"),
271+
TargetOS::Ios => write!(f, "--target-os=ios"),
272272
}
273273
}
274274
}

0 commit comments

Comments
 (0)