Clean up some TODOs, compiler warnings, and lints

Author: adamcrume

examples/addition.rs

@@ -2,7 +2,6 @@ use std::error::Error;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
-use std::process::exit;
 use std::result::Result;
 use tensorflow::Code;
 use tensorflow::Graph;
@@ -17,20 +16,7 @@ use tensorflow::Tensor;
 #[cfg(feature = "examples_system_alloc")]
 static ALLOCATOR: std::alloc::System = std::alloc::System;
 
-fn main() {
-    // Putting the main code in another function serves two purposes:
-    // 1. We can use the `?` operator.
-    // 2. We can call exit safely, which does not run any destructors.
-    exit(match run() {
-        Ok(_) => 0,
-        Err(e) => {
-            println!("{}", e);
-            1
-        }
-    })
-}
-
-fn run() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let filename = "examples/addition/model.pb"; // z = x + y
     if !Path::new(filename).exists() {
         return Err(Box::new(

examples/expressions.rs

@@ -2,7 +2,6 @@ extern crate random;
 extern crate tensorflow;
 
 use std::error::Error;
-use std::process::exit;
 use std::result::Result;
 use tensorflow::expr::{Compiler, Placeholder};
 use tensorflow::Code;
@@ -17,19 +16,6 @@ use tensorflow::Tensor;
 #[cfg(feature = "examples_system_alloc")]
 static ALLOCATOR: std::alloc::System = std::alloc::System;
 
-fn main() {
-    // Putting the main code in another function serves two purposes:
-    // 1. We can use the `?` operator.
-    // 2. We can call exit safely, which does not run any destructors.
-    exit(match run() {
-        Ok(_) => 0,
-        Err(e) => {
-            println!("{}", e);
-            1
-        }
-    })
-}
-
 struct Checker {
     success: bool,
     epsilon: f32,
@@ -55,7 +41,7 @@ impl Checker {
         self.success &= success;
     }
 
-    fn result(&self) -> Result<(), Box<Error>> {
+    fn result(&self) -> Result<(), Box<dyn Error>> {
         if self.success {
             Ok(())
         } else {
@@ -67,7 +53,7 @@ impl Checker {
     }
 }
 
-fn run() -> Result<(), Box<Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     // Build the graph
     let mut g = Graph::new();
     let y_node = {

examples/regression.rs

@@ -4,7 +4,6 @@ use std::error::Error;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
-use std::process::exit;
 use std::result::Result;
 use tensorflow::Code;
 use tensorflow::Graph;
@@ -19,20 +18,7 @@ use tensorflow::Tensor;
 #[cfg(feature = "examples_system_alloc")]
 static ALLOCATOR: std::alloc::System = std::alloc::System;
 
-fn main() {
-    // Putting the main code in another function serves two purposes:
-    // 1. We can use the `?` operator.
-    // 2. We can call exit safely, which does not run any destructors.
-    exit(match run() {
-        Ok(_) => 0,
-        Err(e) => {
-            println!("{}", e);
-            1
-        }
-    })
-}
-
-fn run() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let filename = "examples/regression/model.pb"; // y = w * x + b
     if !Path::new(filename).exists() {
         return Err(Box::new(

examples/regression_checkpoint.rs

@@ -4,7 +4,6 @@ use std::error::Error;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
-use std::process::exit;
 use std::result::Result;
 use tensorflow::Code;
 use tensorflow::Graph;
@@ -19,20 +18,7 @@ use tensorflow::Tensor;
 #[cfg(feature = "examples_system_alloc")]
 static ALLOCATOR: std::alloc::System = std::alloc::System;
 
-fn main() {
-    // Putting the main code in another function serves two purposes:
-    // 1. We can use the `?` operator.
-    // 2. We can call exit safely, which does not run any destructors.
-    exit(match run() {
-        Ok(_) => 0,
-        Err(e) => {
-            println!("{}", e);
-            1
-        }
-    })
-}
-
-fn run() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let filename = "examples/regression_checkpoint/model.pb"; // y = w * x + b
     if !Path::new(filename).exists() {
         return Err(Box::new(

examples/regression_savedmodel.rs

@@ -2,7 +2,6 @@ use random;
 use random::Source;
 use std::error::Error;
 use std::path::Path;
-use std::process::exit;
 use std::result::Result;
 use tensorflow::Code;
 use tensorflow::Graph;
@@ -16,20 +15,7 @@ use tensorflow::Tensor;
 #[cfg(feature = "examples_system_alloc")]
 static ALLOCATOR: std::alloc::System = std::alloc::System;
 
-fn main() {
-    // Putting the main code in another function serves two purposes:
-    // 1. We can use the `?` operator.
-    // 2. We can call exit safely, which does not run any destructors.
-    exit(match run() {
-        Ok(_) => 0,
-        Err(e) => {
-            println!("{}", e);
-            1
-        }
-    })
-}
-
-fn run() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     let export_dir = "examples/regression_savedmodel"; // y = w * x + b
     if !Path::new(export_dir).exists() {
         return Err(Box::new(

src/buffer.rs

@@ -81,7 +81,7 @@ impl<T: TensorType> Buffer<T> {
         (*inner).data = ptr as *const std_c_void;
         (*inner).length = len;
         Buffer {
-            inner: inner,
+            inner,
             owned: true,
             phantom: PhantomData,
         }
@@ -110,7 +110,7 @@ impl<T: TensorType> Buffer<T> {
     pub unsafe fn from_c(buf: *mut tf::TF_Buffer, owned: bool) -> Self {
         Buffer {
             inner: buf,
-            owned: owned,
+            owned,
             phantom: PhantomData,
         }
     }
@@ -229,7 +229,7 @@ impl<T: TensorType> Index<usize> for Buffer<T> {
             index,
             self.length()
         );
-        unsafe { &*self.data().offset(index as isize) }
+        unsafe { &*self.data().add(index) }
     }
 }
 
@@ -242,7 +242,7 @@ impl<T: TensorType> IndexMut<usize> for Buffer<T> {
             index,
             self.length()
         );
-        unsafe { &mut *self.data_mut().offset(index as isize) }
+        unsafe { &mut *self.data_mut().add(index) }
     }
 }
 
@@ -263,7 +263,7 @@ impl<T: TensorType> Index<Range<usize>> for Buffer<T> {
             index.end,
             self.length()
         );
-        unsafe { slice::from_raw_parts(&*self.data().offset(index.start as isize), index.len()) }
+        unsafe { slice::from_raw_parts(&*self.data().add(index.start), index.len()) }
     }
 }
 
@@ -282,12 +282,7 @@ impl<T: TensorType> IndexMut<Range<usize>> for Buffer<T> {
             index.end,
             self.length()
         );
-        unsafe {
-            slice::from_raw_parts_mut(
-                &mut *self.data_mut().offset(index.start as isize),
-                index.len(),
-            )
-        }
+        unsafe { slice::from_raw_parts_mut(&mut *self.data_mut().add(index.start), index.len()) }
     }
 }
 
@@ -331,10 +326,7 @@ impl<T: TensorType> Index<RangeFrom<usize>> for Buffer<T> {
             self.length()
         );
         unsafe {
-            slice::from_raw_parts(
-                &*self.data().offset(index.start as isize),
-                self.length() - index.start,
-            )
+            slice::from_raw_parts(&*self.data().add(index.start), self.length() - index.start)
         }
     }
 }
@@ -350,7 +342,7 @@ impl<T: TensorType> IndexMut<RangeFrom<usize>> for Buffer<T> {
         );
         unsafe {
             slice::from_raw_parts_mut(
-                &mut *self.data_mut().offset(index.start as isize),
+                &mut *self.data_mut().add(index.start),
                 self.length() - index.start,
             )
         }