Skip to content

Commit

Permalink
fix(Conflicts): fixes bug with conflicts not removing required args
Browse files Browse the repository at this point in the history
Closes #271
  • Loading branch information
kbknapp committed Sep 22, 2015
1 parent b096c4b commit e17fcec
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/app/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3078,6 +3078,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
for name in bl {
self.blacklist.push(name);
vec_remove!(self.overrides, name);
vec_remove!(self.required, name);
}
}

Expand Down Expand Up @@ -3178,6 +3179,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
for name in bl {
self.blacklist.push(name);
vec_remove!(self.overrides, name);
vec_remove!(self.required, name);
}
}

Expand Down Expand Up @@ -3368,6 +3370,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
for name in bl {
self.blacklist.push(name);
vec_remove!(self.overrides, name);
vec_remove!(self.required, name);
}
}

Expand Down Expand Up @@ -3465,6 +3468,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
for name in bl {
self.blacklist.push(name);
vec_remove!(self.overrides, name);
vec_remove!(self.required, name);
}
}

Expand Down

0 comments on commit e17fcec

Please sign in to comment.