Skip to content

Commit

Permalink
chore(project): migrate to 2021 edition and fix some clippy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tversteeg committed Apr 6, 2024
1 parent 3b91332 commit b73690f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "aseprite"
description = "A crate to load files from the aseprite sprite editor."
version = "0.1.3"
edition = "2021"
authors = ["Simon Heath <[email protected]>"]
repository = "https://github.com/ggez/aseprite"
documentation = "https://docs.rs/aseprite"
Expand All @@ -11,8 +12,7 @@ readme = "README.md"
categories = ["games", "rendering::data-formats", "multimedia::images"]

[dependencies]
serde = "1.0"
serde_derive = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

[dev-dependencies]
Expand Down
8 changes: 3 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
//! This has been tested to work with aseprite 1.1.6 and 1.2.25; other
//! versions have not been tested.
#[macro_use]
extern crate serde_derive;
use serde::{Deserialize, Serialize};

#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy)]
pub struct Rect {
Expand Down Expand Up @@ -63,7 +62,7 @@ impl serde::Serialize for Color {
impl<'de> serde::Deserialize<'de> for Color {
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let s: String = serde::Deserialize::deserialize(deserializer)?;
if !s.starts_with("#") {
if !s.starts_with('#') {
Err(serde::de::Error::custom("color doesn't start with '#'"))
} else if !s.len() == 7 {
Err(serde::de::Error::custom("color has wrong length"))
Expand Down Expand Up @@ -411,8 +410,7 @@ mod tests {
let (png_info, mut reader) = png::Decoder::new(std::io::Cursor::new(png))
.read_info()
.unwrap_or_else(|e| panic!("{}: error decoding info: {}", path, e));
let mut frame = Vec::new();
frame.resize(png_info.buffer_size(), 0);
let mut frame = vec![0; png_info.buffer_size()];
reader
.next_frame(&mut frame)
.unwrap_or_else(|e| panic!("{}: error decoding frame: {}", path, e));
Expand Down

0 comments on commit b73690f

Please sign in to comment.