emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cargo fmt

Browse source
This commit is contained in:
Vincent Prouillet 2021-06-09 14:14:01 +02:00
parent 9145af6b3e
commit 38ddb1c4d1
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/imageproc/src/lib.rs
View file

@ -555,7 +555,7 @@ impl From<ImageMeta> for ImageMetaResponse {
Self { Self {
width: im.size.0, width: im.size.0,
height: im.size.1, height: im.size.1,
format: im.format.and_then(|f| f.extensions_str().get(0)).map(|&f| f), format: im.format.and_then(|f| f.extensions_str().get(0)).copied(),
} }
} }
} }
@ -589,10 +589,9 @@ pub fn read_image_metadata<P: AsRef<Path>>(path: P) -> Result<ImageMetaResponse>
// Unfortunatelly we have to load the entire image here, unlike with the others :| // Unfortunatelly we have to load the entire image here, unlike with the others :|
let data = fs::read(path).map_err(|e| error(e.into()))?; let data = fs::read(path).map_err(|e| error(e.into()))?;
let decoder = webp::Decoder::new(&data[..]); let decoder = webp::Decoder::new(&data[..]);
decoder decoder.decode().map(ImageMetaResponse::from).ok_or_else(|| {
.decode() Error::msg(format!("Failed to decode WebP image: {}", path.display()))
.map(ImageMetaResponse::from) })
.ok_or_else(|| Error::msg(format!("Failed to decode WebP image: {}", path.display())))
} }
_ => ImageMeta::read(path).map(ImageMetaResponse::from).map_err(|e| error(e.into())), _ => ImageMeta::read(path).map(ImageMetaResponse::from).map_err(|e| error(e.into())),
} }

1
components/imageproc/tests/resize_image.rs
View file

@ -17,7 +17,6 @@ build_search_index = false
highlight_code = false highlight_code = false
"#; "#;
lazy_static! { lazy_static! {
static ref TEST_IMGS: PathBuf = static ref TEST_IMGS: PathBuf =
[env!("CARGO_MANIFEST_DIR"), "tests", "test_imgs"].iter().collect(); [env!("CARGO_MANIFEST_DIR"), "tests", "test_imgs"].iter().collect();