matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Merge pull request #831 from matthiasbeyer/libimagref/remove-unused 

Remove unused variable
This commit is contained in:
Matthias Beyer 2016-11-01 20:59:03 +01:00 committed by GitHub
parent a4db420fdb 35d93ecdd5
commit 8bacdb49b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libimagref/src/reference.rs
View File

@ -157,14 +157,14 @@ impl<'a> Ref<'a> {
.map_err(|e| REK::PathHashingError.into_error_with_cause(e))
);
Ok((file, opt_contenthash, opt_permissions, can, path_hash))
Ok((opt_contenthash, opt_permissions, can, path_hash))
})
// and then we convert the PathBuf of the canonicalized path to a String to be able
// to save it in the Ref FileLockEntry obj
// and return
// (file, content hash, permissions, canonicalized path as String, path hash)
.and_then(|(file, opt_conhash, opt_perm, can, path_hash)| {
.and_then(|(opt_conhash, opt_perm, can, path_hash)| {
match can.to_str().map(String::from) {
// UTF convert error in PathBuf::to_str(),
None => Err(REK::PathUTF8Error.into_error()),