chore: switch to num-derive crate

Cargo.toml

@@ -11,9 +11,9 @@ description = "Read and write the Adobe Flash SWF file format."
 [dependencies]
 clippy = {version = "*", optional = true}
 byteorder = "1.0"
-enum_primitive = "0.1.1"
 flate2 = "1.0"
-num = "0.1"
+num-derive = "0.2"
+num-traits = "0.2"
 xz2 = "0.1.5"
 
 [features]

src/avm1/opcode.rs

@@ -1,6 +1,5 @@
-enum_from_primitive! {
 #[allow(dead_code)]
-#[derive(Debug,PartialEq,Clone,Copy)]
+#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
 pub enum OpCode {
     End = 0x00,
 
@@ -117,4 +116,3 @@ pub enum OpCode {
     Call = 0x9E,
     GotoFrame2 = 0x9F,
 }
-}

src/avm1/read.rs

@@ -31,11 +31,12 @@ impl<R: Read> Reader<R> {
     }
 
     pub fn read_action(&mut self) -> Result<Option<Action>> {
+        use num_traits::FromPrimitive;
+        
         let (opcode, length) = try!(self.read_opcode_and_length());
 
         let mut action_reader = Reader::new(self.inner.by_ref().take(length as u64), self.version);
 
-        use num::FromPrimitive;
         let action = if let Some(op) = OpCode::from_u8(opcode) {
             match op {
                 OpCode::End => return Ok(None),

src/avm2/opcode.rs

@@ -1,6 +1,5 @@
-enum_from_primitive! {
 #[allow(dead_code)]
-#[derive(Debug,PartialEq,Clone,Copy)]
+#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
 pub enum OpCode {
     Add = 0xA0,
     AddI = 0xC5,
@@ -146,4 +145,3 @@ pub enum OpCode {
     TypeOf = 0x95,
     URShift = 0xa7,
 }
-}

src/avm2/read.rs

@@ -517,7 +517,7 @@ impl<R: Read> Reader<R> {
 
     fn read_op(&mut self) -> Result<Option<Op>> {
         use avm2::opcode::OpCode;
-        use num::FromPrimitive;
+        use num_traits::FromPrimitive;
 
         let opcode = match OpCode::from_u8(self.read_u8()?) {
             Some(o) => o,

src/lib.rs

@@ -10,10 +10,10 @@
 #![cfg_attr(feature = "clippy", plugin(clippy))]
 
 extern crate byteorder;
-#[macro_use]
-extern crate enum_primitive;
 extern crate flate2;
-extern crate num;
+#[macro_use]
+extern crate num_derive;
+extern crate num_traits;
 extern crate xz2;
 
 pub mod avm1;

src/read.rs

@@ -2,7 +2,6 @@
 
 use byteorder::{LittleEndian, ReadBytesExt};
 use flate2::read::ZlibDecoder;
-use num::FromPrimitive;
 use std::collections::HashSet;
 use std::io::{Error, ErrorKind, Read, Result};
 use types::*;
@@ -409,6 +408,8 @@ impl<R: Read> Reader<R> {
     }
 
     fn read_tag(&mut self) -> Result<Option<Tag>> {
+        use num_traits::FromPrimitive;
+        
         let (tag_code, length) = self.read_tag_code_and_length()?;
 
         let mut tag_reader = Reader::new(self.input.by_ref().take(length as u64), self.version);

src/tag_codes.rs

@@ -1,6 +1,5 @@
-enum_from_primitive! {
 #[allow(dead_code)]
-#[derive(Debug,PartialEq,Clone,Copy)]
+#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
 pub enum TagCode {
     End = 0,
     ShowFrame = 1,
@@ -86,4 +85,3 @@ pub enum TagCode {
     EnableTelemetry = 93,
     PlaceObject4 = 94,
 }
-}