Update import paths for Rust 2018
Add crate:: where appropriate to fix paths
This commit is contained in:
parent
a84c32d08a
commit
d23a489886
|
@ -1,6 +1,6 @@
|
|||
use avm1::types::*;
|
||||
use avm1::opcode::OpCode;
|
||||
use read::SwfRead;
|
||||
use crate::avm1::types::*;
|
||||
use crate::avm1::opcode::OpCode;
|
||||
use crate::read::SwfRead;
|
||||
use std::io::{Error, ErrorKind, Read, Result};
|
||||
|
||||
pub struct Reader<R: Read> {
|
||||
|
@ -350,7 +350,7 @@ impl<R: Read> Reader<R> {
|
|||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
use test_data;
|
||||
use crate::test_data;
|
||||
|
||||
#[test]
|
||||
fn read_action() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use avm1::types::*;
|
||||
use avm1::opcode::OpCode;
|
||||
use write::SwfWrite;
|
||||
use crate::avm1::types::*;
|
||||
use crate::avm1::opcode::OpCode;
|
||||
use crate::write::SwfWrite;
|
||||
use std::io::{Result, Write};
|
||||
|
||||
pub struct Writer<W: Write> {
|
||||
|
@ -419,7 +419,7 @@ impl<W: Write> Writer<W> {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use test_data;
|
||||
use crate::test_data;
|
||||
|
||||
#[test]
|
||||
fn write_action() {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use avm2::types::*;
|
||||
use read::SwfRead;
|
||||
use crate::avm2::types::*;
|
||||
use crate::read::SwfRead;
|
||||
use std::io::{Error, ErrorKind, Read, Result};
|
||||
|
||||
pub struct Reader<R: Read> {
|
||||
|
@ -516,7 +516,7 @@ impl<R: Read> Reader<R> {
|
|||
}
|
||||
|
||||
fn read_op(&mut self) -> Result<Option<Op>> {
|
||||
use avm2::opcode::OpCode;
|
||||
use crate::avm2::opcode::OpCode;
|
||||
use num_traits::FromPrimitive;
|
||||
|
||||
let opcode = match OpCode::from_u8(self.read_u8()?) {
|
||||
|
@ -848,16 +848,16 @@ impl<R: Read> Reader<R> {
|
|||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
use test_data;
|
||||
use crate::test_data;
|
||||
|
||||
pub fn read_abc_from_file(path: &str) -> Vec<u8> {
|
||||
use types::Tag;
|
||||
use crate::types::Tag;
|
||||
use std::fs::File;
|
||||
|
||||
let mut file = File::open(path).unwrap();
|
||||
let mut data = Vec::new();
|
||||
file.read_to_end(&mut data).unwrap();
|
||||
let swf = ::read_swf(&data[..]).unwrap();
|
||||
let swf = crate::read_swf(&data[..]).unwrap();
|
||||
for tag in swf.tags {
|
||||
match tag {
|
||||
Tag::DoAbc(do_abc) => return do_abc.data,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use avm2::opcode::OpCode;
|
||||
use avm2::types::*;
|
||||
use write::SwfWrite;
|
||||
use crate::avm2::opcode::OpCode;
|
||||
use crate::avm2::types::*;
|
||||
use crate::write::SwfWrite;
|
||||
use std::io::{Result, Write};
|
||||
|
||||
pub struct Writer<W: Write> {
|
||||
|
@ -976,7 +976,7 @@ impl<W: Write> Writer<W> {
|
|||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
use test_data;
|
||||
use crate::test_data;
|
||||
|
||||
#[test]
|
||||
fn write_abc() {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use byteorder::{LittleEndian, ReadBytesExt};
|
||||
use std::collections::HashSet;
|
||||
use std::io::{Error, ErrorKind, Read, Result};
|
||||
use types::*;
|
||||
use crate::types::*;
|
||||
|
||||
/// Reads SWF data from a stream.
|
||||
pub fn read_swf<R: Read>(input: R) -> Result<Swf> {
|
||||
|
@ -437,7 +437,7 @@ impl<R: Read> Reader<R> {
|
|||
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);
|
||||
use tag_codes::TagCode;
|
||||
use crate::tag_codes::TagCode;
|
||||
let tag = match TagCode::from_u16(tag_code) {
|
||||
Some(TagCode::End) => return Ok(None),
|
||||
Some(TagCode::ShowFrame) => Tag::ShowFrame,
|
||||
|
@ -2613,8 +2613,8 @@ pub mod tests {
|
|||
use std::io::{Cursor, Read};
|
||||
use std::vec::Vec;
|
||||
use super::*;
|
||||
use test_data;
|
||||
use tag_codes::TagCode;
|
||||
use crate::test_data;
|
||||
use crate::tag_codes::TagCode;
|
||||
|
||||
fn reader(data: &[u8]) -> Reader<&[u8]> {
|
||||
let default_version = 13;
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
use avm1::types::*;
|
||||
use avm2::types::*;
|
||||
use avm2::read::tests::read_abc_from_file;
|
||||
use crate::avm1::types::*;
|
||||
use crate::avm2::types::*;
|
||||
use crate::avm2::read::tests::read_abc_from_file;
|
||||
use std::fs::File;
|
||||
use std::vec::Vec;
|
||||
use read::read_swf;
|
||||
use read::tests::{read_tag_bytes_from_file, read_tag_bytes_from_file_with_index};
|
||||
use tag_codes::TagCode;
|
||||
use types::*;
|
||||
use write::write_swf;
|
||||
use crate::read::read_swf;
|
||||
use crate::read::tests::{read_tag_bytes_from_file, read_tag_bytes_from_file_with_index};
|
||||
use crate::tag_codes::TagCode;
|
||||
use crate::types::*;
|
||||
use crate::write::write_swf;
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn echo_swf(filename: &str) {
|
||||
|
|
|
@ -5,8 +5,8 @@ use byteorder::{LittleEndian, WriteBytesExt};
|
|||
use std::cmp::max;
|
||||
use std::collections::HashSet;
|
||||
use std::io::{Error, ErrorKind, Result, Write};
|
||||
use tag_codes::TagCode;
|
||||
use types::*;
|
||||
use crate::tag_codes::TagCode;
|
||||
use crate::types::*;
|
||||
|
||||
pub fn write_swf<W: Write>(swf: &Swf, mut output: W) -> Result<()> {
|
||||
let signature = match swf.compression {
|
||||
|
@ -2681,7 +2681,7 @@ mod tests {
|
|||
use super::*;
|
||||
use super::Writer;
|
||||
use std::io::Result;
|
||||
use test_data;
|
||||
use crate::test_data;
|
||||
|
||||
fn new_swf() -> Swf {
|
||||
Swf {
|
||||
|
|
Loading…
Reference in New Issue