chore: switch to num-derive crate
This commit is contained in:
parent
dbb4167e9e
commit
120f94711a
|
@ -11,9 +11,9 @@ description = "Read and write the Adobe Flash SWF file format."
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clippy = {version = "*", optional = true}
|
clippy = {version = "*", optional = true}
|
||||||
byteorder = "1.0"
|
byteorder = "1.0"
|
||||||
enum_primitive = "0.1.1"
|
|
||||||
flate2 = "1.0"
|
flate2 = "1.0"
|
||||||
num = "0.1"
|
num-derive = "0.2"
|
||||||
|
num-traits = "0.2"
|
||||||
xz2 = "0.1.5"
|
xz2 = "0.1.5"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
enum_from_primitive! {
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[derive(Debug,PartialEq,Clone,Copy)]
|
#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
|
||||||
pub enum OpCode {
|
pub enum OpCode {
|
||||||
End = 0x00,
|
End = 0x00,
|
||||||
|
|
||||||
|
@ -117,4 +116,3 @@ pub enum OpCode {
|
||||||
Call = 0x9E,
|
Call = 0x9E,
|
||||||
GotoFrame2 = 0x9F,
|
GotoFrame2 = 0x9F,
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
|
@ -31,11 +31,12 @@ impl<R: Read> Reader<R> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_action(&mut self) -> Result<Option<Action>> {
|
pub fn read_action(&mut self) -> Result<Option<Action>> {
|
||||||
|
use num_traits::FromPrimitive;
|
||||||
|
|
||||||
let (opcode, length) = try!(self.read_opcode_and_length());
|
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);
|
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) {
|
let action = if let Some(op) = OpCode::from_u8(opcode) {
|
||||||
match op {
|
match op {
|
||||||
OpCode::End => return Ok(None),
|
OpCode::End => return Ok(None),
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
enum_from_primitive! {
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[derive(Debug,PartialEq,Clone,Copy)]
|
#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
|
||||||
pub enum OpCode {
|
pub enum OpCode {
|
||||||
Add = 0xA0,
|
Add = 0xA0,
|
||||||
AddI = 0xC5,
|
AddI = 0xC5,
|
||||||
|
@ -146,4 +145,3 @@ pub enum OpCode {
|
||||||
TypeOf = 0x95,
|
TypeOf = 0x95,
|
||||||
URShift = 0xa7,
|
URShift = 0xa7,
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
|
@ -517,7 +517,7 @@ impl<R: Read> Reader<R> {
|
||||||
|
|
||||||
fn read_op(&mut self) -> Result<Option<Op>> {
|
fn read_op(&mut self) -> Result<Option<Op>> {
|
||||||
use avm2::opcode::OpCode;
|
use avm2::opcode::OpCode;
|
||||||
use num::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
|
|
||||||
let opcode = match OpCode::from_u8(self.read_u8()?) {
|
let opcode = match OpCode::from_u8(self.read_u8()?) {
|
||||||
Some(o) => o,
|
Some(o) => o,
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
#![cfg_attr(feature = "clippy", plugin(clippy))]
|
#![cfg_attr(feature = "clippy", plugin(clippy))]
|
||||||
|
|
||||||
extern crate byteorder;
|
extern crate byteorder;
|
||||||
#[macro_use]
|
|
||||||
extern crate enum_primitive;
|
|
||||||
extern crate flate2;
|
extern crate flate2;
|
||||||
extern crate num;
|
#[macro_use]
|
||||||
|
extern crate num_derive;
|
||||||
|
extern crate num_traits;
|
||||||
extern crate xz2;
|
extern crate xz2;
|
||||||
|
|
||||||
pub mod avm1;
|
pub mod avm1;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
use byteorder::{LittleEndian, ReadBytesExt};
|
use byteorder::{LittleEndian, ReadBytesExt};
|
||||||
use flate2::read::ZlibDecoder;
|
use flate2::read::ZlibDecoder;
|
||||||
use num::FromPrimitive;
|
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::io::{Error, ErrorKind, Read, Result};
|
use std::io::{Error, ErrorKind, Read, Result};
|
||||||
use types::*;
|
use types::*;
|
||||||
|
@ -409,6 +408,8 @@ impl<R: Read> Reader<R> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_tag(&mut self) -> Result<Option<Tag>> {
|
fn read_tag(&mut self) -> Result<Option<Tag>> {
|
||||||
|
use num_traits::FromPrimitive;
|
||||||
|
|
||||||
let (tag_code, length) = self.read_tag_code_and_length()?;
|
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);
|
let mut tag_reader = Reader::new(self.input.by_ref().take(length as u64), self.version);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
enum_from_primitive! {
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[derive(Debug,PartialEq,Clone,Copy)]
|
#[derive(Debug,PartialEq,Clone,Copy,FromPrimitive)]
|
||||||
pub enum TagCode {
|
pub enum TagCode {
|
||||||
End = 0,
|
End = 0,
|
||||||
ShowFrame = 1,
|
ShowFrame = 1,
|
||||||
|
@ -86,4 +85,3 @@ pub enum TagCode {
|
||||||
EnableTelemetry = 93,
|
EnableTelemetry = 93,
|
||||||
PlaceObject4 = 94,
|
PlaceObject4 = 94,
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue