alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 09:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy linter errors

Browse source
This commit is contained in:
Gwilym Kuiper 2021-07-21 22:19:28 +01:00
parent 8466e9eaa4
commit bc46764e2f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
agb-image-converter/src/config.rs
View file

@ -5,7 +5,7 @@ use std::fs;
use crate::{TileSize, Colour}; use crate::{TileSize, Colour};
pub(crate) fn parse(filename: &str) -> Box<dyn Config> { pub(crate) fn parse(filename: &str) -> Box<dyn Config> {
let config_toml = fs::read_to_string(filename).expect(&format!("Failed to read file {}", filename)); let config_toml = fs::read_to_string(filename).unwrap_or_else(|_| panic!("Failed to read file {}", filename));
let config: ConfigV1 = toml::from_str(&config_toml).expect("Failed to parse file"); let config: ConfigV1 = toml::from_str(&config_toml).expect("Failed to parse file");
@ -37,7 +37,7 @@ pub struct ConfigV1 {
impl Config for ConfigV1 { impl Config for ConfigV1 {
fn crate_prefix(&self) -> String { fn crate_prefix(&self) -> String {
self.crate_prefix.clone().unwrap_or("agb".to_owned()) self.crate_prefix.clone().unwrap_or_else(|| "agb".to_owned())
} }
fn images(&self) -> HashMap<String, &dyn Image> { fn images(&self) -> HashMap<String, &dyn Image> {
@ -89,9 +89,9 @@ pub enum TileSizeV1 {
Tile16, Tile16,
} }
impl Into<TileSize> for TileSizeV1 { impl From<TileSizeV1> for TileSize {
fn into(self) -> TileSize { fn from(item: TileSizeV1) -> Self {
match self { match item {
TileSizeV1::Tile8 => TileSize::Tile8, TileSizeV1::Tile8 => TileSize::Tile8,
TileSizeV1::Tile16 => TileSize::Tile16, TileSizeV1::Tile16 => TileSize::Tile16,
} }