Fix Clippy lints

Author: adamcrume

src/graph.rs

@@ -22,7 +22,6 @@ use std::fmt;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::mem::MaybeUninit;
-use std::os::raw::c_void as std_c_void;
 use std::ptr;
 use std::slice;
 use std::str::FromStr;
@@ -1906,7 +1905,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrString(
                 self.inner,
                 c_attr_name.as_ptr(),
-                c_value.as_ptr() as *const std_c_void,
+                c_value.as_ptr() as *const c_void,
                 c_value.len() as size_t,
             );
         }
@@ -1928,7 +1927,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrStringList(
                 self.inner,
                 c_attr_name.as_ptr(),
-                ptrs.as_ptr() as *const *const std_c_void,
+                ptrs.as_ptr(),
                 lens.as_ptr(),
                 ptrs.len() as c_int,
             );
@@ -2159,7 +2158,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrTensorShapeProto(
                 self.inner,
                 c_attr_name.as_ptr(),
-                value.as_ptr() as *const std_c_void,
+                value.as_ptr() as *const c_void,
                 value.len() as size_t,
                 status.inner(),
             );
@@ -2185,7 +2184,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrTensorShapeProtoList(
                 self.inner,
                 c_attr_name.as_ptr(),
-                ptrs.as_ptr() as *const *const std_c_void,
+                ptrs.as_ptr(),
                 lens.as_ptr(),
                 ptrs.len() as c_int,
                 status.inner(),
@@ -2238,7 +2237,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrTensorList(
                 self.inner,
                 c_attr_name.as_ptr(),
-                ptrs.as_ptr() as *const *mut tf::TF_Tensor,
+                ptrs.as_ptr(),
                 ptrs.len() as c_int,
                 status.inner(),
             );
@@ -2261,7 +2260,7 @@ impl<'a> OperationDescription<'a> {
             tf::TF_SetAttrValueProto(
                 self.inner,
                 c_attr_name.as_ptr(),
-                value.as_ptr() as *const std_c_void,
+                value.as_ptr() as *const c_void,
                 // Allow trivial_numeric_casts because usize is not
                 // necessarily size_t.
                 value.len() as size_t,
@@ -2329,7 +2328,7 @@ impl Function {
         let status = Status::new();
         unsafe {
             let inner = tf::TF_FunctionImportFunctionDef(
-                proto.as_ptr() as *const std_c_void,
+                proto.as_ptr() as *const c_void,
                 proto.len(),
                 status.inner,
             );
@@ -2349,7 +2348,7 @@ impl Function {
             tf::TF_FunctionSetAttrValueProto(
                 self.inner,
                 attr_name_cstr.as_ptr(),
-                proto.as_ptr() as *const std_c_void,
+                proto.as_ptr() as *const c_void,
                 proto.len(),
                 status.inner,
             );

src/lib.rs

@@ -344,87 +344,86 @@ c_enum!("Error values that can be returned.", TF_Code, Code {
 
 ////////////////////////
 
-c_enum!("Type of a single tensor element.", TF_DataType, DataType {
+c_enum!(
+TF_DataType,
+/// Type of a single tensor element.
+#[derive(Default)]
+DataType {
   /// 32-bit floating point.
-  value Float = 1,
+  #[default]
+  Float = 1,
 
   /// 64-bit floating point.
-  value Double = 2,
+  Double = 2,
 
   /// 32-bit signed integer.
-  value Int32 = 3,
+  Int32 = 3,
 
   /// 8-bit unsigned integer.
-  value UInt8 = 4,
+  UInt8 = 4,
 
   /// 16-bit signed integer.
-  value Int16 = 5,
+  Int16 = 5,
 
   /// 8-bit signed integer.
-  value Int8 = 6,
+  Int8 = 6,
 
   /// String.
-  value String = 7,
+  String = 7,
 
   /// Complex number composed of two 32-bit floats.
-  value Complex64 = 8,
+  Complex64 = 8,
 
   /// 64-bit signed integer.
-  value Int64 = 9,
+  Int64 = 9,
 
   /// Boolean.
-  value Bool = 10,
+  Bool = 10,
 
   /// Quantized 8-bit signed integer.
-  value QInt8 = 11,
+  QInt8 = 11,
 
   /// Quantized 8-bit unsigned integer.
-  value QUInt8 = 12,
+  QUInt8 = 12,
 
   /// Quantized 32-bit signed integer.
-  value QInt32 = 13,
+  QInt32 = 13,
 
   /// Float32 truncated to 16 bits.  Only for cast ops.
   /// Note that this is not the same as Half.  BFloat16 is not an IEEE-754
   /// 16-bit float.  See
   /// <https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/framework/bfloat16.h>
   /// for details.
-  value BFloat16 = 14,
+  BFloat16 = 14,
 
   /// Quantized 16-bit signed integer.
-  value QInt16 = 15,
+  QInt16 = 15,
 
   /// Quantized 16-bit unsigned integer.
-  value QUInt16 = 16,
+  QUInt16 = 16,
 
   /// 16-bit unsigned integer.
-  value UInt16 = 17,
+  UInt16 = 17,
 
   /// Complex number composed of two 64-bit floats.
-  value Complex128 = 18,
+  Complex128 = 18,
 
   /// 16-bit floating point.
-  value Half = 19,
+  Half = 19,
 
   /// TensorFlow Resource (name, container, device,...)
-  value Resource = 20,
+  Resource = 20,
 
   /// A dynamic type similar to std::any::Any.
-  value Variant = 21,
+  Variant = 21,
 
   /// 32-bit unsigned integer.
-  value UInt32 = 22,
+  UInt32 = 22,
 
   /// 64-bit unsigned integer.
-  value UInt64 = 23,
+  UInt64 = 23,
 });
 
-impl Default for DataType {
-    fn default() -> DataType {
-        DataType::Float
-    }
-}
-
 impl DataType {
     // We don't use Into, because we don't want this to be public API.
     fn into_proto(self) -> protos::types::DataType {
@@ -658,7 +657,7 @@ pub type Result<T> = std::result::Result<T, Status>;
 ////////////////////////
 
 /// A common implementation of the sealed supertrait
-/// 
+///
 /// See https://rust-lang.github.io/api-guidelines/future-proofing.html#sealed-traits-protect-against-downstream-implementations-c-sealed
 mod private {
     use crate::{BFloat16, QInt16, QInt32, QInt8, QUInt16, QUInt8};
@@ -1092,7 +1091,7 @@ where
             // Zero-initialize allocated memory.
             let data = tf::TF_TensorData(inner);
             let byte_size = tf::TF_TensorByteSize(inner);
-            libc::memset(data as *mut libc::c_void, 0, byte_size);
+            libc::memset(data, 0, byte_size);
 
             TensorDataCRepr {
                 inner,

src/session.rs

@@ -164,7 +164,7 @@ impl Session {
                 self.inner,
                 run_options_ptr,
                 step.input_ports.as_ptr(),
-                input_tensors.as_ptr() as *const *mut tf::TF_Tensor,
+                input_tensors.as_ptr(),
                 input_tensors.len() as c_int,
                 step.output_ports.as_ptr(),
                 step.output_tensors.as_mut_ptr(),

tensorflow-op-codegen/src/bin/eager.rs

@@ -437,7 +437,7 @@ fn define_op<W: Write>(
                     write!(w, "Some(f32::INFINITY)")?;
                 } else if f == &f32::NEG_INFINITY {
                     write!(w, "Some(f32::NEG_INFINITY)")?;
-                } else if f == &f32::NAN {
+                } else if f.is_nan() {
                     write!(w, "Some(f32::NAN)")?;
                 } else {
                     write!(w, "Some({}f32)", f)?;

tensorflow-sys/build.rs

@@ -245,8 +245,8 @@ fn install_prebuilt() {
     let framework_library_file = format!("{}{}{}", dll_prefix(), FRAMEWORK_LIBRARY, dll_suffix());
     let library_file = format!("{}{}{}", dll_prefix(), LIBRARY, dll_suffix());
 
-    let framework_library_full_path = lib_dir.join(&framework_library_file);
-    let library_full_path = lib_dir.join(&library_file);
+    let framework_library_full_path = lib_dir.join(framework_library_file);
+    let library_full_path = lib_dir.join(library_file);
 
     let download_required =
         (!windows && !framework_library_full_path.exists()) || !library_full_path.exists();