matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove unused variable "file"

Browse source
This commit is contained in:
Matthias Beyer 2017-02-05 15:01:46 +01:00
parent 63ffbf62de
commit f22bcf0c74
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libimagref/src/reference.rs
View file

@ -137,22 +137,22 @@ impl<'a> Ref<'a> {
None
};
Ok((file, opt_contenthash, opt_permissions))
Ok((opt_contenthash, opt_permissions))
})
// and then we try to canonicalize the PathBuf, because we want to store a
// canonicalized path
// and return (file, content hash, permissions, canonicalized path)
.and_then(|(file, opt_contenthash, opt_permissions)| {
.and_then(|(opt_contenthash, opt_permissions)| {
pb.canonicalize()
.map(|can| (file, opt_contenthash, opt_permissions, can))
.map(|can| (opt_contenthash, opt_permissions, can))
// if PathBuf::canonicalize() failed, build an error from the return value
.map_err(|e| REK::PathCanonicalizationError.into_error_with_cause(Box::new(e)))
})
// and then we hash the canonicalized path
// and return (file, content hash, permissions, canonicalized path, path hash)
.and_then(|(file, opt_contenthash, opt_permissions, can)| {
.and_then(|(opt_contenthash, opt_permissions, can)| {
let path_hash = try!(Ref::hash_path(&can)
.map_err(Box::new)
.map_err(|e| REK::PathHashingError.into_error_with_cause(e))