tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conversions to appease new clippy

Browse Source
This commit is contained in:
Joonas Koivunen 2020-06-05 22:17:07 +03:00
parent d05ce949b7
commit a93923fbe2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unixfs/src/file/reader.rs
View File

@ -89,7 +89,7 @@ impl<'a> FileReader<'a> {
if inner.data.mode.is_some() || inner.data.mtime.is_some() {
let metadata = FileMetadata::from(&inner.data);
return Err(FileError::NonRootDefinesMetadata(metadata))?;
return Err(FileError::NonRootDefinesMetadata(metadata).into());
}
Self::from_parts(inner, offset, traversal.metadata)
@ -111,9 +111,9 @@ impl<'a> FileReader<'a> {
if inner.data.Type != UnixFsType::File && inner.data.Type != UnixFsType::Raw {
Err(FileReadFailed::UnexpectedType(inner.data.Type.into()))
} else if inner.links.len() != inner.data.blocksizes.len() {
Err(FileError::LinksAndBlocksizesMismatch)?
Err(FileError::LinksAndBlocksizesMismatch.into())
} else if empty_or_no_content && !is_zero_bytes && inner.links.is_empty() {
Err(FileError::NoLinksNoContent)?
Err(FileError::NoLinksNoContent.into())
} else {
// raw and file seem to be same except the raw is preferred in trickle dag
let data = inner.data.Data.unwrap_borrowed_or_empty();