Skip to content

Commit aa845ea

Browse files
9prady99prady9
committed
Fix clippy warnings for enum declarations about Eq trait
1 parent edb64d6 commit aa845ea

File tree

5 files changed

+33
-39
lines changed

5 files changed

+33
-39
lines changed

‎src/core/array.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,6 @@ where
665665
/// Fetch Array as String
666666
#[allow(clippy::inherent_to_string)]
667667
pub fn to_string(&self) -> String {
668-
let result: String;
669-
670668
let cname = CString::new("test").unwrap();
671669
let mut tmp: *mut c_char = ::std::ptr::null_mut();
672670
let err_val = unsafe {
@@ -679,9 +677,8 @@ where
679677
)
680678
};
681679
HANDLE_ERROR(AfError::from(err_val));
682-
result = unsafe { CStr::from_ptr(tmp).to_string_lossy().into_owned() };
680+
let result: String = unsafe { CStr::from_ptr(tmp).to_string_lossy().into_owned() };
683681
free_host(tmp);
684-
685682
result
686683
}
687684
}

‎src/core/defines.rs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
77

88
/// Error codes
99
#[repr(u32)]
10-
#[derive(Clone, Copy, Debug, PartialEq)]
10+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
1111
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
1212
pub enum AfError {
1313
/// The function returned successfully
@@ -55,7 +55,7 @@ pub enum AfError {
5555

5656
/// Compute/Acceleration Backend
5757
#[repr(u32)]
58-
#[derive(Clone, Copy, Debug, PartialEq)]
58+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
5959
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
6060
pub enum Backend {
6161
/// Default backend order: CUDA -> OpenCL -> CPU
@@ -107,7 +107,7 @@ impl Display for AfError {
107107

108108
/// Types of Array data type
109109
#[repr(u32)]
110-
#[derive(Clone, Copy, Debug, PartialEq)]
110+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
111111
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
112112
pub enum DType {
113113
/// 32 bit float
@@ -140,7 +140,7 @@ pub enum DType {
140140

141141
/// Dictates the interpolation method to be used by a function
142142
#[repr(u32)]
143-
#[derive(Clone, Copy, Debug, PartialEq)]
143+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
144144
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
145145
pub enum InterpType {
146146
/// Nearest Neighbor interpolation method
@@ -167,7 +167,7 @@ pub enum InterpType {
167167

168168
/// Helps determine how to pad kernels along borders
169169
#[repr(u32)]
170-
#[derive(Clone, Copy, Debug, PartialEq)]
170+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
171171
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
172172
pub enum BorderType {
173173
/// Pad using zeros
@@ -184,7 +184,7 @@ pub enum BorderType {
184184

185185
/// Used by `regions` function to identify type of connectivity
186186
#[repr(u32)]
187-
#[derive(Clone, Copy, Debug, PartialEq)]
187+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
188188
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
189189
pub enum Connectivity {
190190
/// North-East-South-West (N-E-S-W) connectivity from given pixel/point
@@ -195,7 +195,7 @@ pub enum Connectivity {
195195

196196
/// Helps determine the size of output of convolution
197197
#[repr(u32)]
198-
#[derive(Clone, Copy, Debug, PartialEq)]
198+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
199199
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
200200
pub enum ConvMode {
201201
/// Default convolution mode where output size is same as input size
@@ -206,7 +206,7 @@ pub enum ConvMode {
206206

207207
/// Helps determine if convolution is in Spatial or Frequency domain
208208
#[repr(u32)]
209-
#[derive(Clone, Copy, Debug, PartialEq)]
209+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
210210
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
211211
pub enum ConvDomain {
212212
/// ArrayFire chooses whether the convolution will be in spatial domain or frequency domain
@@ -219,7 +219,7 @@ pub enum ConvDomain {
219219

220220
/// Error metric used by `matchTemplate` function
221221
#[repr(u32)]
222-
#[derive(Clone, Copy, Debug, PartialEq)]
222+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
223223
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
224224
pub enum MatchType {
225225
/// Sum of Absolute Differences
@@ -244,7 +244,7 @@ pub enum MatchType {
244244

245245
/// Identify the color space of given image(Array)
246246
#[repr(u32)]
247-
#[derive(Clone, Copy, Debug, PartialEq)]
247+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
248248
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
249249
pub enum ColorSpace {
250250
/// Grayscale color space
@@ -257,7 +257,7 @@ pub enum ColorSpace {
257257

258258
/// Helps determine the type of a Matrix
259259
#[repr(u32)]
260-
#[derive(Clone, Copy, Debug, PartialEq)]
260+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
261261
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
262262
pub enum MatProp {
263263
/// Default (no-op)
@@ -289,7 +289,7 @@ pub enum MatProp {
289289
/// Norm type
290290
#[allow(non_camel_case_types)]
291291
#[repr(u32)]
292-
#[derive(Clone, Copy, Debug, PartialEq)]
292+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
293293
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
294294
pub enum NormType {
295295
/// Treats input as a vector and return sum of absolute values
@@ -312,7 +312,7 @@ pub enum NormType {
312312

313313
/// Dictates what color map is used for Image rendering
314314
#[repr(u32)]
315-
#[derive(Clone, Copy, Debug, PartialEq)]
315+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
316316
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
317317
pub enum ColorMap {
318318
/// Default color map is grayscale range [0-1]
@@ -333,7 +333,7 @@ pub enum ColorMap {
333333

334334
/// YCbCr Standards
335335
#[repr(u32)]
336-
#[derive(Clone, Copy, Debug, PartialEq)]
336+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
337337
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
338338
pub enum YCCStd {
339339
/// ITU-R BT.601 (formerly CCIR 601) standard
@@ -346,7 +346,7 @@ pub enum YCCStd {
346346

347347
/// Homography type
348348
#[repr(u32)]
349-
#[derive(Clone, Copy, Debug, PartialEq)]
349+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
350350
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
351351
pub enum HomographyType {
352352
/// RANdom SAmple Consensus algorithm
@@ -357,7 +357,7 @@ pub enum HomographyType {
357357

358358
/// Plotting markers
359359
#[repr(u32)]
360-
#[derive(Clone, Copy, Debug, PartialEq)]
360+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
361361
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
362362
pub enum MarkerType {
363363
/// No marker
@@ -380,7 +380,7 @@ pub enum MarkerType {
380380

381381
/// Image moment types
382382
#[repr(u32)]
383-
#[derive(Clone, Copy, Debug, PartialEq)]
383+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
384384
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
385385
pub enum MomentType {
386386
/// Central moment of order (0 + 0)
@@ -397,7 +397,7 @@ pub enum MomentType {
397397

398398
/// Sparse storage format type
399399
#[repr(u32)]
400-
#[derive(Clone, Copy, Debug, PartialEq)]
400+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
401401
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
402402
pub enum SparseFormat {
403403
/// Dense format
@@ -412,7 +412,7 @@ pub enum SparseFormat {
412412

413413
/// Binary operation types for generalized scan functions
414414
#[repr(u32)]
415-
#[derive(Clone, Copy, Debug, PartialEq)]
415+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
416416
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
417417
pub enum BinaryOp {
418418
/// Addition operation
@@ -427,7 +427,7 @@ pub enum BinaryOp {
427427

428428
/// Random engine types
429429
#[repr(u32)]
430-
#[derive(Clone, Copy, Debug, PartialEq)]
430+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
431431
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
432432
pub enum RandomEngineType {
433433
///Philox variant with N=4, W=32 and Rounds=10
@@ -489,7 +489,7 @@ pub enum Scalar {
489489

490490
/// Canny edge detector threshold operations types
491491
#[repr(u32)]
492-
#[derive(Clone, Copy, Debug, PartialEq)]
492+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
493493
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
494494
pub enum CannyThresholdType {
495495
/// User has to define canny thresholds manually
@@ -500,7 +500,7 @@ pub enum CannyThresholdType {
500500

501501
/// Anisotropic diffusion flux equation types
502502
#[repr(u32)]
503-
#[derive(Clone, Copy, Debug, PartialEq)]
503+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
504504
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
505505
pub enum DiffusionEq {
506506
/// Quadratic flux function
@@ -513,7 +513,7 @@ pub enum DiffusionEq {
513513

514514
/// Diffusion equation types
515515
#[repr(u32)]
516-
#[derive(Clone, Copy, Debug, PartialEq)]
516+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
517517
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
518518
pub enum FluxFn {
519519
/// Quadratic flux function
@@ -526,7 +526,7 @@ pub enum FluxFn {
526526

527527
/// topk function ordering
528528
#[repr(u32)]
529-
#[derive(Clone, Copy, Debug, PartialEq)]
529+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
530530
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
531531
pub enum TopkFn {
532532
/// Top k min values
@@ -539,7 +539,7 @@ pub enum TopkFn {
539539

540540
/// Iterative Deconvolution Algorithm
541541
#[repr(u32)]
542-
#[derive(Clone, Copy, Debug, PartialEq)]
542+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
543543
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
544544
pub enum IterativeDeconvAlgo {
545545
/// Land-Weber Algorithm
@@ -552,7 +552,7 @@ pub enum IterativeDeconvAlgo {
552552

553553
/// Inverse Deconvolution Algorithm
554554
#[repr(u32)]
555-
#[derive(Clone, Copy, Debug, PartialEq)]
555+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
556556
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
557557
pub enum InverseDeconvAlgo {
558558
/// Tikhonov algorithm
@@ -563,7 +563,7 @@ pub enum InverseDeconvAlgo {
563563

564564
/// Gradient mode for convolution
565565
#[repr(u32)]
566-
#[derive(Clone, Copy, Debug, PartialEq)]
566+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
567567
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
568568
pub enum ConvGradientType {
569569
/// Filter Gradient
@@ -578,7 +578,7 @@ pub enum ConvGradientType {
578578

579579
/// Gradient mode for convolution
580580
#[repr(u32)]
581-
#[derive(Clone, Copy, Debug, PartialEq)]
581+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
582582
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
583583
pub enum VarianceBias {
584584
/// Sample variance
@@ -591,7 +591,7 @@ pub enum VarianceBias {
591591

592592
/// Gradient mode for convolution
593593
#[repr(u32)]
594-
#[derive(Clone, Copy, Debug, PartialEq)]
594+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
595595
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
596596
pub enum CublasMathMode {
597597
/// To indicate use of Tensor Cores on CUDA capable GPUs

‎src/core/device.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,11 @@ pub fn info() {
9494
/// [0] GeForce GT 750M, 2048 MB, CUDA Compute 3.0
9595
/// ```
9696
pub fn info_string(verbose: bool) -> String {
97-
let result: String;
98-
9997
let mut tmp: *mut c_char = ::std::ptr::null_mut();
10098
let err_val = unsafe { af_info_string(&mut tmp, verbose) };
10199
HANDLE_ERROR(AfError::from(err_val));
102-
result = unsafe { CStr::from_ptr(tmp).to_string_lossy().into_owned() };
100+
let result: String = unsafe { CStr::from_ptr(tmp).to_string_lossy().into_owned() };
103101
free_host(tmp);
104-
105102
result
106103
}
107104

‎src/core/dim4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::ops::{Index, IndexMut};
55
use serde::{Deserialize, Serialize};
66

77
/// Dim4 is used to store [Array](./struct.Array.html) dimensions
8-
#[derive(Copy, Clone, PartialEq)]
8+
#[derive(Copy, Clone, PartialEq, Eq)]
99
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
1010
pub struct Dim4 {
1111
dims: [u64; 4],

‎src/core/seq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::fmt;
88
use super::util::IndexableType;
99

1010
/// Sequences are used for indexing Arrays
11-
#[derive(Copy, Clone, Debug, PartialEq)]
11+
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
1212
#[cfg_attr(feature = "afserde", derive(Serialize, Deserialize))]
1313
#[repr(C)]
1414
pub struct Seq<T: IndexableType> {

0 commit comments

Comments
 (0)