Skip to content

Commit 8a3ac0b

Browse files
committed
chore: fmt
1 parent 4c4e703 commit 8a3ac0b

File tree

9 files changed

+189
-171
lines changed

9 files changed

+189
-171
lines changed

src/cli/flags.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,16 @@ impl HelpOrVersion {
122122
},
123123

124124
// Same flag already set
125-
(HelpOrVersion::Help, HelpOrVersion::Help) => Err(CliParseError::DuplicateFlag(
126-
Flag::GlobalFlag(HelpOrVersion::Help),
127-
)),
128-
(HelpOrVersion::Version, HelpOrVersion::Version) => Err(CliParseError::DuplicateFlag(
129-
Flag::GlobalFlag(HelpOrVersion::Version),
130-
)),
125+
(HelpOrVersion::Help, HelpOrVersion::Help) => {
126+
Err(CliParseError::DuplicateFlag(Flag::GlobalFlag(
127+
HelpOrVersion::Help,
128+
)))
129+
},
130+
(HelpOrVersion::Version, HelpOrVersion::Version) => {
131+
Err(CliParseError::DuplicateFlag(Flag::GlobalFlag(
132+
HelpOrVersion::Version,
133+
)))
134+
},
131135

132136
// Conflicting flags
133137
(HelpOrVersion::Help, HelpOrVersion::Version)

src/cli/mod.rs

+21-15
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ impl fmt::Display for CliParseError {
3434
match self {
3535
CliParseError::UnexpectedFlag(flag) => write!(f, "Unexpected flag: {flag}"),
3636
CliParseError::DuplicateFlag(flag) => write!(f, "Cannot use {flag} more than once"),
37-
CliParseError::MutuallyExclusiveFlags => write!(
38-
f,
39-
"Flags {} and {} are mutually exclusive, so they cannot be used together.",
40-
HelpOrVersion::Help,
41-
HelpOrVersion::Version
42-
),
37+
CliParseError::MutuallyExclusiveFlags => {
38+
write!(
39+
f,
40+
"Flags {} and {} are mutually exclusive, so they cannot be used together.",
41+
HelpOrVersion::Help,
42+
HelpOrVersion::Version
43+
)
44+
},
4345
CliParseError::UnknownArgument(arg) => write!(f, "Unknown argument: {arg}"),
4446
CliParseError::EmptyArgument(arg) => write!(f, "Empty argument: {arg}"),
4547
CliParseError::InvalidArgument(arg) => write!(f, "Invalid argument: {arg}"),
@@ -65,11 +67,13 @@ impl fmt::Display for CliParseError {
6567
write!(f, "{pr} must be followed by a commit hash")
6668
},
6769
CliParseError::InvalidRepo(repo) => write!(f, "Invalid repo: {repo}"),
68-
CliParseError::CheckoutNoSource => write!(
69-
f,
70-
"Expected at least 1 argument when using the {} flag",
71-
LocalFlag::Checkout
72-
),
70+
CliParseError::CheckoutNoSource => {
71+
write!(
72+
f,
73+
"Expected at least 1 argument when using the {} flag",
74+
LocalFlag::Checkout
75+
)
76+
},
7377
CliParseError::InvalidCommitHash(commit) => {
7478
write!(f, "{commit} is not a valid commit hash")
7579
},
@@ -165,10 +169,12 @@ impl Cli {
165169
"pr-fetch" => {
166170
Subcommand::PrFetch(pr_fetch::PrFetch::parse(&mut args, &mut global_flag)?)
167171
},
168-
"branch-fetch" => Subcommand::BranchFetch(branch_fetch::BranchFetch::parse(
169-
&mut args,
170-
&mut global_flag,
171-
)?),
172+
"branch-fetch" => {
173+
Subcommand::BranchFetch(branch_fetch::BranchFetch::parse(
174+
&mut args,
175+
&mut global_flag,
176+
)?)
177+
},
172178
arg => return Err(CliParseError::UnknownSubcommand(arg.to_owned())),
173179
});
174180
}

src/commands/branch_fetch.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ pub async fn branch_fetch(args: BranchFetch) -> anyhow::Result<()> {
1616
info.branch.local_branch_name.bright_cyan(),
1717
branch
1818
.commit
19-
.map(|commit_hash| format!(
20-
", at commit {}",
21-
commit_hash.as_ref().bright_yellow()
22-
))
19+
.map(|commit_hash| {
20+
format!(", at commit {}", commit_hash.as_ref().bright_yellow())
21+
})
2322
.unwrap_or_default()
2423
);
2524

0 commit comments

Comments
 (0)