From 902b2cc27809531c1198afe4d234fc4edd9391f3 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 16 Jun 2020 17:51:17 +0200 Subject: [PATCH] src/tools/disks/zfs.rs: simplify code --- src/tools/disks/zfs.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tools/disks/zfs.rs b/src/tools/disks/zfs.rs index 79117783..f8591ba1 100644 --- a/src/tools/disks/zfs.rs +++ b/src/tools/disks/zfs.rs @@ -11,7 +11,7 @@ use nom::{ combinator::{map_res, all_consuming, recognize, opt}, sequence::{preceded, tuple}, character::complete::{space1, digit1, char, line_ending}, - multi::{many0, many1}, + multi::{many0}, }; use super::*; @@ -185,10 +185,7 @@ fn parse_pool_status(i: &str) -> IResult<&str, ZFSPoolStatus> { /// Note: This does not reveal any details on how the pool uses the devices, because /// the zpool list output format is not really defined... pub fn parse_zfs_list(i: &str) -> Result, Error> { - if i.is_empty() { - return Ok(Vec::new()); - } - match all_consuming(many1(parse_pool_status))(i) { + match all_consuming(many0(parse_pool_status))(i) { Err(nom::Err::Error(err)) | Err(nom::Err::Failure(err)) => { bail!("unable to parse zfs list output - {}", nom::error::convert_error(i, err));