forked from gentoo-utils/gentoo-utils
update to new version of mon
This commit is contained in:
@@ -200,7 +200,7 @@ fn read_src_uri(input: &str) -> Option<Result<Vec<Depend<SrcUri>>, Error>> {
|
||||
.find_map(|line| line.strip_prefix("SRC_URI="))?;
|
||||
|
||||
match Depend::<SrcUri>::parser()
|
||||
.separated_list(whitespace1(), 0..)
|
||||
.separated_by(whitespace1(), 0..)
|
||||
.parse_finished(InputIter::new(line))
|
||||
{
|
||||
Ok(slot) => Some(Ok(slot)),
|
||||
@@ -223,7 +223,7 @@ fn read_inherit(input: &str) -> Option<Result<Vec<Eclass>, Error>> {
|
||||
.find_map(|line| line.strip_prefix("INHERIT="))?;
|
||||
|
||||
match Eclass::parser()
|
||||
.separated_list(whitespace1(), 0..)
|
||||
.separated_by(whitespace1(), 0..)
|
||||
.parse_finished(InputIter::new(line))
|
||||
{
|
||||
Ok(inherit) => Some(Ok(inherit)),
|
||||
@@ -235,7 +235,7 @@ fn read_iuse(input: &str) -> Option<Result<Vec<IUseFlag>, Error>> {
|
||||
let line = input.lines().find_map(|line| line.strip_prefix("IUSE="))?;
|
||||
|
||||
match IUseFlag::parser()
|
||||
.separated_list(whitespace1(), 0..)
|
||||
.separated_by(whitespace1(), 0..)
|
||||
.parse_finished(InputIter::new(line))
|
||||
{
|
||||
Ok(iuse) => Some(Ok(iuse)),
|
||||
@@ -249,7 +249,7 @@ fn read_license(input: &str) -> Option<Result<Vec<Depend<License>>, Error>> {
|
||||
.find_map(|line| line.strip_suffix("LICENSE="))?;
|
||||
|
||||
match Depend::<License>::parser()
|
||||
.separated_list(whitespace1(), 0..)
|
||||
.separated_by(whitespace1(), 0..)
|
||||
.parse_finished(InputIter::new(line))
|
||||
{
|
||||
Ok(license) => Some(Ok(license)),
|
||||
@@ -297,7 +297,7 @@ fn read_idepend(input: &str) -> Option<Result<Vec<Depend<Atom>>, Error>> {
|
||||
|
||||
fn parse_depends(line: &str) -> Result<Vec<Depend<Atom>>, Error> {
|
||||
Depend::<Atom>::parser()
|
||||
.separated_list(whitespace1(), 0..)
|
||||
.separated_by(whitespace1(), 0..)
|
||||
.parse_finished(InputIter::new(line))
|
||||
.map_err(|_| Error::Parser(line.to_string()))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user