Merge pull request #101 from adamcrume/master

Remove unused and deprecated code

Author: adamcrume

src/buffer.rs

@@ -91,24 +91,6 @@ impl<T: TensorType> Buffer<T> {
         }
     }
 
-    /// Consumes the buffer and returns the data.
-    ///
-    /// The caller is responsible for freeing the data.
-    pub unsafe fn into_ptr(mut self) -> (*mut T, usize) {
-        // TODO: remove
-        (*self.inner).data_deallocator = None;
-        (self.data_mut(), self.length())
-    }
-
-    /// Returns a buffer with a null pointer.
-    pub unsafe fn null() -> Self {
-        Buffer {
-            inner: ptr::null::<tf::TF_Buffer>() as *mut _,
-            owned: false,
-            phantom: PhantomData,
-        }
-    }
-
     #[inline]
     fn data(&self) -> *const T {
         unsafe { (*self.inner).data as *const T }

src/lib.rs

@@ -14,7 +14,7 @@ extern crate libc;
 extern crate num_complex;
 extern crate tensorflow_sys as tf;
 
-use libc::{c_int, c_uint, size_t};
+use libc::{c_int, c_uint};
 use num_complex::Complex;
 use std::cmp::Ordering;
 use std::error::Error;
@@ -30,7 +30,6 @@ use std::ops::Deref;
 use std::ops::DerefMut;
 use std::ops::Drop;
 use std::ops::Index;
-use std::os::raw::c_void as std_c_void;
 use std::str::Utf8Error;
 
 ////////////////////////
@@ -661,12 +660,6 @@ pub struct Tensor<T: TensorType> {
     owned: bool,
 }
 
-unsafe extern "C" fn noop_deallocator(_: *mut std_c_void, _: size_t, _: *mut std_c_void) -> () {}
-
-unsafe extern "C" fn deallocator(_: *mut std_c_void, _: size_t, buffer: *mut std_c_void) -> () {
-    tf::TF_DeleteBuffer(buffer as *mut tf::TF_Buffer);
-}
-
 #[inline]
 fn product(values: &[u64]) -> u64 {
     values.iter().product()
@@ -692,18 +685,6 @@ impl<T: TensorType> Tensor<T> {
         }
     }
 
-    /// Returns the tensor's data.
-    #[deprecated(note="Deref the tensor as a slice instead.")]
-    pub fn data(&self) -> &Buffer<T> {
-        &self.data
-    }
-
-    /// Returns the tensor's data.
-    #[deprecated(note="Deref the tensor as a slice instead.")]
-    pub fn data_mut(&mut self) -> &mut Buffer<T> {
-        &mut self.data
-    }
-
     /// Returns the tensor's dimensions.
     pub fn dims(&self) -> &[u64] {
         &self.dims
@@ -726,13 +707,6 @@ impl<T: TensorType> Tensor<T> {
             owned: true,
         })
     }
-
-    /// The caller is responsible for deleting the tensor.
-    unsafe fn into_ptr(mut self) -> *mut tf::TF_Tensor {
-        // This flag is used by drop.
-        self.owned = false;
-        self.inner
-    }
 }
 
 impl<T: TensorType> Drop for Tensor<T> {
@@ -837,9 +811,6 @@ pub fn version() -> std::result::Result<String, Utf8Error> {
 
 ////////////////////////
 
-#[deprecated(note="Use Shape instead.")]
-pub type TensorShape = Shape;
-
 /// A Shape is the shape of a tensor.  A Shape may be an unknown rank, or it may
 /// have a known rank with each dimension being known or unknown.
 #[derive(Debug,Eq,Ord,PartialEq,PartialOrd,Hash,Clone)]