Skip to content
Snippets Groups Projects
Commit ec15fa21 authored by Matthew Hall's avatar Matthew Hall
Browse files

Fix warnings

parent 99e72326
No related branches found
No related tags found
No related merge requests found
...@@ -3,11 +3,11 @@ extern crate flate2; ...@@ -3,11 +3,11 @@ extern crate flate2;
extern crate xml; extern crate xml;
extern crate serialize; extern crate serialize;
use std::io::{File, BufferedReader, BufReader, IoError, EndOfFile}; use std::io::{BufReader, IoError, EndOfFile};
use xml::reader::EventReader; use xml::reader::EventReader;
use xml::common::Attribute; use xml::common::Attribute;
use xml::reader::events::*; use xml::reader::events::*;
use serialize::base64::{FromBase64}; use serialize::base64::FromBase64;
use flate2::reader::ZlibDecoder; use flate2::reader::ZlibDecoder;
macro_rules! get_attrs { macro_rules! get_attrs {
...@@ -190,7 +190,7 @@ pub fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>, ...@@ -190,7 +190,7 @@ pub fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>,
match zd.read_le_u32() { match zd.read_le_u32() {
Ok(v) => row.push(v), Ok(v) => row.push(v),
Err(IoError{kind, ..}) if kind == EndOfFile => return Ok(data), Err(IoError{kind, ..}) if kind == EndOfFile => return Ok(data),
Err(e) => return Err("Zlib decoding error".to_string()) Err(_) => return Err("Zlib decoding error".to_string())
} }
if row.len() == width { if row.len() == width {
data.push(row); data.push(row);
...@@ -206,7 +206,7 @@ pub fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>, ...@@ -206,7 +206,7 @@ pub fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>,
return Ok(Vec::new()); return Ok(Vec::new());
} }
} }
EndElement => return Err("Premature end to data".to_string()) _ => {}
} }
} }
} }
......
...@@ -4,11 +4,9 @@ extern crate serialize; ...@@ -4,11 +4,9 @@ extern crate serialize;
extern crate xml; extern crate xml;
extern crate tiled; extern crate tiled;
use serialize::base64::{FromBase64};
use std::io::File; use std::io::File;
use std::io::BufferedReader; use std::io::BufferedReader;
use xml::reader::EventReader; use xml::reader::EventReader;
use xml::reader::events::*;
use tiled::parse; use tiled::parse;
fn main() { fn main() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment