Skip to content

fix(builder): Switch from owned to borrowed builder #6216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
epage wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(builder): Switch from owned to borrowed builder #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
275 changes: 118 additions & 157 deletions clap_builder/src/builder/arg.rs
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 21 additions & 22 deletions clap_builder/src/builder/arg_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ impl ArgGroup {
/// # ;
/// ```
pub fn new(id: impl Into<Id>) -> Self {
ArgGroup::default().id(id)
let mut group = ArgGroup::default();
group.id(id);
group
}

/// Sets the group name.
Expand All @@ -123,8 +125,7 @@ impl ArgGroup {
/// ArgGroup::default().id("config")
/// # ;
/// ```
#[must_use]
pub fn id(mut self, id: impl Into<Id>) -> Self {
pub fn id(&mut self, id: impl Into<Id>) -> &mut Self {
self.id = id.into();
self
}
Expand Down Expand Up @@ -153,8 +154,7 @@ impl ArgGroup {
/// assert!(m.contains_id("flag"));
/// ```
/// [argument]: crate::Arg
#[must_use]
pub fn arg(mut self, arg_id: impl IntoResettable<Id>) -> Self {
pub fn arg(&mut self, arg_id: impl IntoResettable<Id>) -> &mut Self {
if let Some(arg_id) = arg_id.into_resettable().into_option() {
self.args.push(arg_id);
} else {
Expand Down Expand Up @@ -186,10 +186,9 @@ impl ArgGroup {
/// assert!(m.contains_id("flag"));
/// ```
/// [arguments]: crate::Arg
#[must_use]
pub fn args(mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> Self {
pub fn args(&mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> &mut Self {
for n in ns {
self = self.arg(n);
self.arg(n);
}
self
}
Expand Down Expand Up @@ -260,8 +259,7 @@ impl ArgGroup {
///
/// [`Arg`]: crate::Arg
#[inline]
#[must_use]
pub fn multiple(mut self, yes: bool) -> Self {
pub fn multiple(&mut self, yes: bool) -> &mut Self {
self.multiple = yes;
self
}
Expand Down Expand Up @@ -323,8 +321,7 @@ impl ArgGroup {
/// [`ArgGroup::multiple`]: ArgGroup::multiple()
/// [`Command`]: crate::Command
#[inline]
#[must_use]
pub fn required(mut self, yes: bool) -> Self {
pub fn required(&mut self, yes: bool) -> &mut Self {
self.required = yes;
self
}
Expand Down Expand Up @@ -364,8 +361,7 @@ impl ArgGroup {
/// ```
/// [required group]: ArgGroup::required()
/// [argument requirement rules]: crate::Arg::requires()
#[must_use]
pub fn requires(mut self, id: impl IntoResettable<Id>) -> Self {
pub fn requires(&mut self, id: impl IntoResettable<Id>) -> &mut Self {
if let Some(id) = id.into_resettable().into_option() {
self.requires.push(id);
} else {
Expand Down Expand Up @@ -412,10 +408,9 @@ impl ArgGroup {
/// ```
/// [required group]: ArgGroup::required()
/// [argument requirement rules]: crate::Arg::requires_ifs()
#[must_use]
pub fn requires_all(mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> Self {
pub fn requires_all(&mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> &mut Self {
for n in ns {
self = self.requires(n);
self.requires(n);
}
self
}
Expand Down Expand Up @@ -453,8 +448,7 @@ impl ArgGroup {
/// assert_eq!(err.kind(), ErrorKind::ArgumentConflict);
/// ```
/// [argument exclusion rules]: crate::Arg::conflicts_with()
#[must_use]
pub fn conflicts_with(mut self, id: impl IntoResettable<Id>) -> Self {
pub fn conflicts_with(&mut self, id: impl IntoResettable<Id>) -> &mut Self {
if let Some(id) = id.into_resettable().into_option() {
self.conflicts.push(id);
} else {
Expand Down Expand Up @@ -500,10 +494,9 @@ impl ArgGroup {
/// ```
///
/// [argument exclusion rules]: crate::Arg::conflicts_with_all()
#[must_use]
pub fn conflicts_with_all(mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> Self {
pub fn conflicts_with_all(&mut self, ns: impl IntoIterator<Item = impl Into<Id>>) -> &mut Self {
for n in ns {
self = self.conflicts_with(n);
self.conflicts_with(n);
}
self
}
Expand All @@ -524,6 +517,12 @@ impl ArgGroup {
}
}

impl From<&'_ mut ArgGroup> for ArgGroup {
fn from(g: &mut ArgGroup) -> Self {
g.clone()
}
}

impl From<&'_ ArgGroup> for ArgGroup {
fn from(g: &ArgGroup) -> Self {
g.clone()
Expand Down
Loading