Skip to content

Commit e17fcec

Browse files
committed
fix(Conflicts): fixes bug with conflicts not removing required args
Closes #271
1 parent b096c4b commit e17fcec

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/app/app.rs

+4
Original file line numberDiff line numberDiff line change
@@ -3078,6 +3078,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
30783078
for name in bl {
30793079
self.blacklist.push(name);
30803080
vec_remove!(self.overrides, name);
3081+
vec_remove!(self.required, name);
30813082
}
30823083
}
30833084

@@ -3178,6 +3179,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
31783179
for name in bl {
31793180
self.blacklist.push(name);
31803181
vec_remove!(self.overrides, name);
3182+
vec_remove!(self.required, name);
31813183
}
31823184
}
31833185

@@ -3368,6 +3370,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
33683370
for name in bl {
33693371
self.blacklist.push(name);
33703372
vec_remove!(self.overrides, name);
3373+
vec_remove!(self.required, name);
33713374
}
33723375
}
33733376

@@ -3465,6 +3468,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
34653468
for name in bl {
34663469
self.blacklist.push(name);
34673470
vec_remove!(self.overrides, name);
3471+
vec_remove!(self.required, name);
34683472
}
34693473
}
34703474

0 commit comments

Comments
 (0)