Merge pull request #16 from mrhooray/rr

use internal crate to share make table functions

Cargo.toml

@@ -9,12 +9,11 @@ repository = "https://github.com/mrhooray/crc-rs.git"
 license = "MIT"
 
 [dependencies]
-
-[dependencies.build_const]
-version = "0.2"
-default-features = false
+util = { path = "./src/util" }
+build_const = { version = "0.2", default-features = false }
 
 [build-dependencies]
+util = { path = "./src/util" }
 build_const = "0.2"
 
 [features]

build.rs

@@ -1,54 +1,22 @@
-
+extern crate util;
 extern crate build_const;
 
-pub fn make_table_crc32(poly: u32) -> [u32; 256] {
-    let mut table = [0u32; 256];
-    for i in 0..256 {
-        let mut value = i as u32;
-        for _ in 0..8 {
-            value = if (value & 1) == 1 {
-                (value >> 1) ^ poly
-            } else {
-                value >> 1
-            }
-        }
-        table[i] = value;
-    }
-    table
-}
-
-pub fn make_table_crc64(poly: u64) -> [u64; 256] {
-    let mut table = [0u64; 256];
-    for i in 0..256 {
-        let mut value = i as u64;
-        for _ in 0..8 {
-            value = if (value & 1) == 1 {
-                (value >> 1) ^ poly
-            } else {
-                value >> 1
-            }
-        }
-        table[i] = value;
-    }
-    table
-}
-
 #[allow(non_snake_case)]
 fn create_constants() {
     let mut crc32 = build_const::ConstWriter::for_build("crc32_constants")
         .unwrap()
         .finish_dependencies();
     let CASTAGNOLI: u32 = 0x82f63b78;
     crc32.add_value("CASTAGNOLI", "u32", CASTAGNOLI);
-    crc32.add_array("CASTAGNOLI_TABLE", "u32", &make_table_crc32(CASTAGNOLI));
+    crc32.add_array("CASTAGNOLI_TABLE", "u32", &util::make_table_crc32(CASTAGNOLI));
 
     let IEEE: u32 = 0xedb88320;
     crc32.add_value("IEEE", "u32", IEEE);
-    crc32.add_array("IEEE_TABLE", "u32", &make_table_crc32(IEEE));
+    crc32.add_array("IEEE_TABLE", "u32", &util::make_table_crc32(IEEE));
 
     let KOOPMAN: u32 = 0xeb31d82e;
     crc32.add_value("KOOPMAN", "u32", KOOPMAN);
-    crc32.add_array("KOOPMAN_TABLE", "u32", &make_table_crc32(KOOPMAN));
+    crc32.add_array("KOOPMAN_TABLE", "u32", &util::make_table_crc32(KOOPMAN));
 
     crc32.finish();
 
@@ -58,16 +26,15 @@ fn create_constants() {
 
     let ECMA: u64 = 0xc96c5795d7870f42;
     crc64.add_value("ECMA", "u64", ECMA);
-    crc64.add_array("ECMA_TABLE", "u64", &make_table_crc64(ECMA));
+    crc64.add_array("ECMA_TABLE", "u64", &util::make_table_crc64(ECMA));
 
     let ISO: u64 = 0xd800000000000000;
     crc64.add_value("ISO", "u64", ISO);
-    crc64.add_array("ISO_TABLE", "u64", &make_table_crc64(ISO));
+    crc64.add_array("ISO_TABLE", "u64", &util::make_table_crc64(ISO));
 
     crc64.finish();
 }
 
 fn main() {
     create_constants();
 }
-

src/crc32.rs

@@ -3,6 +3,8 @@ use std::hash::Hasher;
 #[cfg(not(feature = "std"))]
 use core::hash::Hasher;
 
+pub use util::make_table_crc32 as make_table;
+
 build_const!("crc32_constants");
 
 pub struct Digest {
@@ -17,22 +19,6 @@ pub trait Hasher32 {
     fn sum32(&self) -> u32;
 }
 
-pub fn make_table(poly: u32) -> [u32; 256] {
-    let mut table = [0u32; 256];
-    for i in 0..256 {
-        let mut value = i as u32;
-        for _ in 0..8 {
-            value = if (value & 1) == 1 {
-                (value >> 1) ^ poly
-            } else {
-                value >> 1
-            }
-        }
-        table[i] = value;
-    }
-    table
-}
-
 pub fn update(mut value: u32, table: &[u32; 256], bytes: &[u8]) -> u32 {
     value = !value;
     for &i in bytes.iter() {

src/crc64.rs

@@ -3,6 +3,8 @@ use std::hash::Hasher;
 #[cfg(not(feature = "std"))]
 use core::hash::Hasher;
 
+pub use util::make_table_crc64 as make_table;
+
 build_const!("crc64_constants");
 
 pub struct Digest {
@@ -17,22 +19,6 @@ pub trait Hasher64 {
     fn sum64(&self) -> u64;
 }
 
-pub fn make_table(poly: u64) -> [u64; 256] {
-    let mut table = [0u64; 256];
-    for i in 0..256 {
-        let mut value = i as u64;
-        for _ in 0..8 {
-            value = if (value & 1) == 1 {
-                (value >> 1) ^ poly
-            } else {
-                value >> 1
-            }
-        }
-        table[i] = value;
-    }
-    table
-}
-
 pub fn update(mut value: u64, table: &[u64; 256], bytes: &[u8]) -> u64 {
     value = !value;
     for &i in bytes.iter() {

src/lib.rs

@@ -44,6 +44,7 @@
 
 #[macro_use]
 extern crate build_const;
+extern crate util;
 
 pub mod crc32;
 pub mod crc64;

src/util/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "util"
+version = "0.1.0"
+
+[lib]
+name = "util"
+path = "lib.rs"

src/util/lib.rs

@@ -0,0 +1,33 @@
+//! utility functions shared between source and build script
+
+pub fn make_table_crc32(poly: u32) -> [u32; 256] {
+    let mut table = [0u32; 256];
+    for i in 0..256 {
+        let mut value = i as u32;
+        for _ in 0..8 {
+            value = if (value & 1) == 1 {
+                (value >> 1) ^ poly
+            } else {
+                value >> 1
+            }
+        }
+        table[i] = value;
+    }
+    table
+}
+
+pub fn make_table_crc64(poly: u64) -> [u64; 256] {
+    let mut table = [0u64; 256];
+    for i in 0..256 {
+        let mut value = i as u64;
+        for _ in 0..8 {
+            value = if (value & 1) == 1 {
+                (value >> 1) ^ poly
+            } else {
+                value >> 1
+            }
+        }
+        table[i] = value;
+    }
+    table
+}