mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-28 08:17:37 +00:00
safe-path: Fix needless_borrow warnings
As we bumped the rust toolchain to 1.66.0, some new warnings have been raised due to needless_borrow. Let's fix them all here. For more info about the warnings, please, take a look at: https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
parent
bb78d35db8
commit
126187e814
@ -295,7 +295,7 @@ mod tests {
|
|||||||
barrier2.wait();
|
barrier2.wait();
|
||||||
});
|
});
|
||||||
|
|
||||||
let path = scoped_join(&root_path, "s").unwrap();
|
let path = scoped_join(root_path, "s").unwrap();
|
||||||
let data = fs::read_to_string(&path).unwrap();
|
let data = fs::read_to_string(&path).unwrap();
|
||||||
assert_eq!(&data, "a");
|
assert_eq!(&data, "a");
|
||||||
assert!(path.is_file());
|
assert!(path.is_file());
|
||||||
@ -306,7 +306,7 @@ mod tests {
|
|||||||
assert_eq!(&data, "b");
|
assert_eq!(&data, "b");
|
||||||
PinnedPathBuf::from_path(&path).unwrap_err();
|
PinnedPathBuf::from_path(&path).unwrap_err();
|
||||||
|
|
||||||
let pinned_path = PinnedPathBuf::new(&root_path, "s").unwrap();
|
let pinned_path = PinnedPathBuf::new(root_path, "s").unwrap();
|
||||||
let data = fs::read_to_string(&pinned_path).unwrap();
|
let data = fs::read_to_string(&pinned_path).unwrap();
|
||||||
assert_eq!(&data, "b");
|
assert_eq!(&data, "b");
|
||||||
|
|
||||||
|
@ -173,7 +173,7 @@ mod tests {
|
|||||||
fs::write(rootfs_path.join("txt"), "test").unwrap();
|
fs::write(rootfs_path.join("txt"), "test").unwrap();
|
||||||
ScopedDirBuilder::new(rootfs_path.join("txt")).unwrap_err();
|
ScopedDirBuilder::new(rootfs_path.join("txt")).unwrap_err();
|
||||||
|
|
||||||
let mut builder = ScopedDirBuilder::new(&rootfs_path).unwrap();
|
let mut builder = ScopedDirBuilder::new(rootfs_path).unwrap();
|
||||||
|
|
||||||
// file with the same name already exists.
|
// file with the same name already exists.
|
||||||
builder
|
builder
|
||||||
@ -268,7 +268,7 @@ mod tests {
|
|||||||
symlink(rootfs_dir.path().join("b"), rootfs_dir.path().join("a")).unwrap();
|
symlink(rootfs_dir.path().join("b"), rootfs_dir.path().join("a")).unwrap();
|
||||||
let rootfs_path = &rootfs_dir.path().join("a");
|
let rootfs_path = &rootfs_dir.path().join("a");
|
||||||
|
|
||||||
let mut builder = ScopedDirBuilder::new(&rootfs_path).unwrap();
|
let mut builder = ScopedDirBuilder::new(rootfs_path).unwrap();
|
||||||
builder.create_with_unscoped_path("/").unwrap_err();
|
builder.create_with_unscoped_path("/").unwrap_err();
|
||||||
builder
|
builder
|
||||||
.create_with_unscoped_path(rootfs_path.join("../__xxxx___xxx__"))
|
.create_with_unscoped_path(rootfs_path.join("../__xxxx___xxx__"))
|
||||||
@ -278,13 +278,13 @@ mod tests {
|
|||||||
.unwrap_err();
|
.unwrap_err();
|
||||||
|
|
||||||
// Return `AlreadyExist` when recursive is false
|
// Return `AlreadyExist` when recursive is false
|
||||||
builder.create_with_unscoped_path(&rootfs_path).unwrap_err();
|
builder.create_with_unscoped_path(rootfs_path).unwrap_err();
|
||||||
builder
|
builder
|
||||||
.create_with_unscoped_path(rootfs_path.join("."))
|
.create_with_unscoped_path(rootfs_path.join("."))
|
||||||
.unwrap_err();
|
.unwrap_err();
|
||||||
|
|
||||||
builder.recursive(true);
|
builder.recursive(true);
|
||||||
builder.create_with_unscoped_path(&rootfs_path).unwrap();
|
builder.create_with_unscoped_path(rootfs_path).unwrap();
|
||||||
builder
|
builder
|
||||||
.create_with_unscoped_path(rootfs_path.join("."))
|
.create_with_unscoped_path(rootfs_path.join("."))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
@ -329,31 +329,31 @@ mod tests {
|
|||||||
let rootfs_path = &rootfs_dir.path();
|
let rootfs_path = &rootfs_dir.path();
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "a").unwrap(),
|
scoped_join(rootfs_path, "a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "./a").unwrap(),
|
scoped_join(rootfs_path, "./a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "././a").unwrap(),
|
scoped_join(rootfs_path, "././a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "c/d/../../a").unwrap(),
|
scoped_join(rootfs_path, "c/d/../../a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "c/d/../../../.././a").unwrap(),
|
scoped_join(rootfs_path, "c/d/../../../.././a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "../../a").unwrap(),
|
scoped_join(rootfs_path, "../../a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "./../a").unwrap(),
|
scoped_join(rootfs_path, "./../a").unwrap(),
|
||||||
rootfs_path.join("a")
|
rootfs_path.join("a")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -370,18 +370,18 @@ mod tests {
|
|||||||
fs::symlink("b/c", rootfs_dir.path().join("a")).unwrap();
|
fs::symlink("b/c", rootfs_dir.path().join("a")).unwrap();
|
||||||
|
|
||||||
let target = rootfs_path.join("b/c");
|
let target = rootfs_path.join("b/c");
|
||||||
assert_eq!(scoped_join(&rootfs_path, "a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "./a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "./a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "././a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "././a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "b/c/../../a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "b/c/../../a").unwrap(), target);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
scoped_join(&rootfs_path, "b/c/../../../.././a").unwrap(),
|
scoped_join(rootfs_path, "b/c/../../../.././a").unwrap(),
|
||||||
target
|
target
|
||||||
);
|
);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "../../a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "../../a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "./../a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "./../a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "a/../../../a").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "a/../../../a").unwrap(), target);
|
||||||
assert_eq!(scoped_join(&rootfs_path, "a/../../../b/c").unwrap(), target);
|
assert_eq!(scoped_join(rootfs_path, "a/../../../b/c").unwrap(), target);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
Loading…
Reference in New Issue
Block a user