tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: fix needless borrows

Browse Source 
found and fixed via clippy

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-12-30 12:57:37 +01:00
parent a0c69902c8
commit 9a37bd6c84
104 changed files with 238 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/disks/zfs.rs
View File

@ -20,7 +20,7 @@ lazy_static!{
pub fn get_pool_from_dataset(dataset: &OsStr) -> Option<&OsStr> {
if let Some(dataset) = dataset.to_str() {
if let Some(idx) = dataset.find('/') {
return Some(&dataset[0..idx].as_ref());
return Some(dataset[0..idx].as_ref());
}
}

10
src/tools/disks/zpool_list.rs
View File

@ -157,13 +157,13 @@ fn test_zfs_parse_list() -> Result<(), Error> {
let output = "";
let data = parse_zpool_list(&output)?;
let data = parse_zpool_list(output)?;
let expect = Vec::new();
assert_eq!(data, expect);
let output = "btest 427349245952 405504 427348840448 - - 0 0 1.00 ONLINE -\n";
let data = parse_zpool_list(&output)?;
let data = parse_zpool_list(output)?;
let expect = vec![
ZFSPoolInfo {
name: "btest".to_string(),
@ -190,7 +190,7 @@ logs
";
let data = parse_zpool_list(&output)?;
let data = parse_zpool_list(output)?;
let expect = vec![
ZFSPoolInfo {
name: String::from("rpool"),
@ -232,7 +232,7 @@ logs - - - - - - - - -
/dev/sda5 213674622976 0 213674622976 - - 0 0 - ONLINE
";
let data = parse_zpool_list(&output)?;
let data = parse_zpool_list(output)?;
let expect = vec![
ZFSPoolInfo {
name: String::from("b-test"),
@ -267,7 +267,7 @@ b.test 427349245952 761856 427348484096 - - 0 0 1.00 ONLINE -
/dev/sda1 - - - - - - - - ONLINE
";
let data = parse_zpool_list(&output)?;
let data = parse_zpool_list(output)?;
let expect = vec![
ZFSPoolInfo {
name: String::from("b.test"),

6
src/tools/disks/zpool_status.rs
View File

@ -189,7 +189,7 @@ pub fn parse_zpool_status_config_tree(i: &str) -> Result<Vec<ZFSPoolVDevState>,
}
fn parse_zpool_status(input: &str) -> Result<Vec<(String, String)>, Error> {
parse_complete("zfs status output", &input, many0(parse_zpool_status_field))
parse_complete("zfs status output", input, many0(parse_zpool_status_field))
}
pub fn vdev_list_to_tree(vdev_list: &[ZFSPoolVDevState]) -> Result<Value, Error> {
@ -220,7 +220,7 @@ where
};
for item in items {
let (node, node_level) = to_node(&item);
let (node, node_level) = to_node(item);
let vdev_level = 1 + node_level;
let mut node = match node {
Value::Object(map) => map,
@ -373,7 +373,7 @@ pub fn zpool_status(pool: &str) -> Result<Vec<(String, String)>, Error> {
fn test_parse(output: &str) -> Result<(), Error> {
let mut found_config = false;
for (k, v) in parse_zpool_status(&output)? {
for (k, v) in parse_zpool_status(output)? {
println!("<{}> => '{}'", k, v);
if k == "config" {
let vdev_list = parse_zpool_status_config_tree(&v)?;