Merge pull request #128 from oyvindln/rust-backend

Rust backend miniz_oxide

Author: alexcrichton

.travis.yml

@@ -15,6 +15,8 @@ script:
   - cargo test --verbose --features tokio
   - cargo test --verbose --features 'tokio zlib'
   - cargo test --verbose --features zlib --no-default-features
+  - cargo test --verbose --features rust_backend
+  - cargo test --verbose --features rust_backend --no-default-features
   - cargo clean && cargo build
   - cargo doc --no-deps
   - cargo doc --no-deps --manifest-path=miniz-sys/Cargo.toml

Cargo.toml

@@ -24,6 +24,7 @@ miniz-sys = { path = "miniz-sys", version = "0.1.7", optional = true }
 libz-sys = { version = "1.0", optional = true }
 tokio-io = { version = "0.1", optional = true }
 futures = { version = "0.1", optional = true }
+miniz_oxide_c_api = { version = "0.1", optional = true}
 
 [dev-dependencies]
 rand = "0.3"
@@ -33,6 +34,7 @@ tokio-core = "0.1"
 [features]
 default = ["miniz-sys"]
 zlib = ["libz-sys"]
+rust_backend = ["miniz_oxide_c_api"]
 tokio = ["tokio-io", "futures"]
 
 [badges]

src/ffi.rs

@@ -98,14 +98,43 @@ mod imp {
     }
 }
 
-#[cfg(not(feature = "zlib"))]
+#[cfg(all(not(feature = "zlib"), feature = "rust_backend"))]
+mod imp {
+    extern crate miniz_oxide_c_api;
+    use std::ops::{Deref, DerefMut};
+
+    pub use ffi::crc_imp::*;
+    pub use self::miniz_oxide_c_api::*;
+    pub use self::miniz_oxide_c_api::lib_oxide::*;
+
+    #[derive(Debug, Default)]
+    pub struct StreamWrapper {
+        inner: mz_stream,
+    }
+
+    impl Deref for StreamWrapper {
+        type Target = mz_stream;
+
+        fn deref(&self) -> &Self::Target {
+            &self.inner
+        }
+    }
+
+    impl DerefMut for StreamWrapper {
+        fn deref_mut(&mut self) -> &mut Self::Target {
+            &mut self.inner
+        }
+    }
+}
+
+#[cfg(all(not(feature = "zlib"), not(feature = "rust_backend")))]
 mod imp {
     extern crate miniz_sys;
     use std::mem;
     use std::ops::{Deref, DerefMut};
 
-    use libc::{c_ulong, off_t};
     pub use self::miniz_sys::*;
+    pub use ffi::crc_imp::*;
 
     pub struct StreamWrapper {
         inner: mz_stream,
@@ -138,7 +167,11 @@ mod imp {
             &mut self.inner
         }
     }
+}
 
+#[cfg(not(feature = "zlib"))]
+mod crc_imp {
+    use libc::{c_ulong, off_t};
     pub unsafe extern fn mz_crc32_combine(crc1: c_ulong,
                                           crc2: c_ulong,
                                           len2: off_t) -> c_ulong {