Skip to content

Commit d06b022

Browse files
dasheddashed
authored
Merge pull request #37 from armcknight/armcknight/fix/unused-warning
fix: unused field warning
2 parents b84930b + c6d8d34 commit d06b022

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

‎src/main.rs

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn print_rebase_error(executable_name: &str, branch: &str, upstream_branch: &str
9494
}
9595

9696
enum BranchSearchResult {
97-
NotPartOfAnyChain(String),
97+
NotPartOfAnyChain,
9898
Branch(Branch),
9999
}
100100

@@ -139,9 +139,7 @@ impl Branch {
139139
|| !git_chain.git_local_branch_exists(branch_name)?
140140
{
141141
Branch::delete_all_configs(git_chain, branch_name)?;
142-
return Ok(BranchSearchResult::NotPartOfAnyChain(
143-
branch_name.to_string(),
144-
));
142+
return Ok(BranchSearchResult::NotPartOfAnyChain);
145143
}
146144

147145
let branch = Branch {
@@ -400,7 +398,7 @@ impl Chain {
400398
let results = Branch::get_branch_with_chain(git_chain, branch_name)?;
401399

402400
match results {
403-
BranchSearchResult::NotPartOfAnyChain(_) => {
401+
BranchSearchResult::NotPartOfAnyChain => {
404402
// TODO: could this fail silently?
405403
eprintln!(
406404
"Branch not correctly set up as part of a chain: {}",
@@ -795,7 +793,7 @@ impl GitChain {
795793
let results = Branch::get_branch_with_chain(self, &branch_name)?;
796794

797795
match results {
798-
BranchSearchResult::NotPartOfAnyChain(_) => {
796+
BranchSearchResult::NotPartOfAnyChain => {
799797
self.display_branch_not_part_of_chain_error(&branch_name);
800798
process::exit(1);
801799
}
@@ -817,11 +815,11 @@ impl GitChain {
817815
let results = Branch::get_branch_with_chain(self, branch_name)?;
818816

819817
match results {
820-
BranchSearchResult::NotPartOfAnyChain(_) => {
818+
BranchSearchResult::NotPartOfAnyChain => {
821819
Branch::setup_branch(self, chain_name, root_branch, branch_name, &sort_option)?;
822820

823821
match Branch::get_branch_with_chain(self, branch_name)? {
824-
BranchSearchResult::NotPartOfAnyChain(_) => {
822+
BranchSearchResult::NotPartOfAnyChain => {
825823
eprintln!("Unable to set up chain for branch: {}", branch_name.bold());
826824
process::exit(1);
827825
}
@@ -849,7 +847,7 @@ impl GitChain {
849847
let results = Branch::get_branch_with_chain(self, &branch_name)?;
850848

851849
match results {
852-
BranchSearchResult::NotPartOfAnyChain(_) => {
850+
BranchSearchResult::NotPartOfAnyChain => {
853851
Branch::delete_all_configs(self, &branch_name)?;
854852

855853
println!(
@@ -904,15 +902,15 @@ impl GitChain {
904902
sort_option: &SortBranch,
905903
) -> Result<(), Error> {
906904
match Branch::get_branch_with_chain(self, branch_name)? {
907-
BranchSearchResult::NotPartOfAnyChain(_) => {
905+
BranchSearchResult::NotPartOfAnyChain => {
908906
self.display_branch_not_part_of_chain_error(branch_name);
909907
process::exit(1);
910908
}
911909
BranchSearchResult::Branch(branch) => {
912910
branch.move_branch(self, chain_name, sort_option)?;
913911

914912
match Branch::get_branch_with_chain(self, &branch.branch_name)? {
915-
BranchSearchResult::NotPartOfAnyChain(_) => {
913+
BranchSearchResult::NotPartOfAnyChain => {
916914
eprintln!("Unable to move branch: {}", branch.branch_name.bold());
917915
process::exit(1);
918916
}
@@ -1519,7 +1517,7 @@ fn parse_sort_option(
15191517
}
15201518

15211519
let before_branch = match Branch::get_branch_with_chain(git_chain, before_branch)? {
1522-
BranchSearchResult::NotPartOfAnyChain(_) => {
1520+
BranchSearchResult::NotPartOfAnyChain => {
15231521
git_chain.display_branch_not_part_of_chain_error(before_branch);
15241522
process::exit(1);
15251523
}
@@ -1545,7 +1543,7 @@ fn parse_sort_option(
15451543
}
15461544

15471545
let after_branch = match Branch::get_branch_with_chain(git_chain, after_branch)? {
1548-
BranchSearchResult::NotPartOfAnyChain(_) => {
1546+
BranchSearchResult::NotPartOfAnyChain => {
15491547
git_chain.display_branch_not_part_of_chain_error(after_branch);
15501548
process::exit(1);
15511549
}
@@ -1676,7 +1674,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
16761674
let branch_name = git_chain.get_current_branch_name()?;
16771675

16781676
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1679-
BranchSearchResult::NotPartOfAnyChain(_) => {
1677+
BranchSearchResult::NotPartOfAnyChain => {
16801678
git_chain.display_branch_not_part_of_chain_error(&branch_name);
16811679
process::exit(1);
16821680
}
@@ -1756,7 +1754,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
17561754
let branch_name = git_chain.get_current_branch_name()?;
17571755

17581756
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1759-
BranchSearchResult::NotPartOfAnyChain(_) => {
1757+
BranchSearchResult::NotPartOfAnyChain => {
17601758
git_chain.display_branch_not_part_of_chain_error(&branch_name);
17611759
process::exit(1);
17621760
}
@@ -1779,7 +1777,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
17791777
let branch_name = git_chain.get_current_branch_name()?;
17801778

17811779
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1782-
BranchSearchResult::NotPartOfAnyChain(_) => {
1780+
BranchSearchResult::NotPartOfAnyChain => {
17831781
git_chain.display_branch_not_part_of_chain_error(&branch_name);
17841782
process::exit(1);
17851783
}
@@ -1794,7 +1792,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
17941792
let branch_name = git_chain.get_current_branch_name()?;
17951793

17961794
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1797-
BranchSearchResult::NotPartOfAnyChain(_) => {
1795+
BranchSearchResult::NotPartOfAnyChain => {
17981796
git_chain.display_branch_not_part_of_chain_error(&branch_name);
17991797
process::exit(1);
18001798
}
@@ -1810,7 +1808,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
18101808
let branch_name = git_chain.get_current_branch_name()?;
18111809

18121810
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1813-
BranchSearchResult::NotPartOfAnyChain(_) => {
1811+
BranchSearchResult::NotPartOfAnyChain => {
18141812
git_chain.display_branch_not_part_of_chain_error(&branch_name);
18151813
process::exit(1);
18161814
}
@@ -1829,7 +1827,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
18291827
let branch_name = git_chain.get_current_branch_name()?;
18301828

18311829
let branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1832-
BranchSearchResult::NotPartOfAnyChain(_) => {
1830+
BranchSearchResult::NotPartOfAnyChain => {
18331831
git_chain.display_branch_not_part_of_chain_error(&branch_name);
18341832
process::exit(1);
18351833
}
@@ -1906,7 +1904,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
19061904
eprintln!("With root branch: {}", branch.root_branch.bold());
19071905
process::exit(1);
19081906
}
1909-
BranchSearchResult::NotPartOfAnyChain(_) => {}
1907+
BranchSearchResult::NotPartOfAnyChain => {}
19101908
}
19111909

19121910
if visited_branches.contains(branch_name) {
@@ -1943,7 +1941,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
19431941
let branch_name = git_chain.get_current_branch_name()?;
19441942

19451943
let current_branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1946-
BranchSearchResult::NotPartOfAnyChain(_) => {
1944+
BranchSearchResult::NotPartOfAnyChain => {
19471945
git_chain.display_branch_not_part_of_chain_error(&branch_name);
19481946
process::exit(1);
19491947
}
@@ -1977,7 +1975,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
19771975
let branch_name = git_chain.get_current_branch_name()?;
19781976

19791977
let current_branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
1980-
BranchSearchResult::NotPartOfAnyChain(_) => {
1978+
BranchSearchResult::NotPartOfAnyChain => {
19811979
git_chain.display_branch_not_part_of_chain_error(&branch_name);
19821980
process::exit(1);
19831981
}
@@ -2011,7 +2009,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
20112009
let branch_name = git_chain.get_current_branch_name()?;
20122010

20132011
let current_branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
2014-
BranchSearchResult::NotPartOfAnyChain(_) => {
2012+
BranchSearchResult::NotPartOfAnyChain => {
20152013
git_chain.display_branch_not_part_of_chain_error(&branch_name);
20162014
process::exit(1);
20172015
}
@@ -2058,7 +2056,7 @@ fn run(arg_matches: ArgMatches) -> Result<(), Error> {
20582056
let branch_name = git_chain.get_current_branch_name()?;
20592057

20602058
let current_branch = match Branch::get_branch_with_chain(&git_chain, &branch_name)? {
2061-
BranchSearchResult::NotPartOfAnyChain(_) => {
2059+
BranchSearchResult::NotPartOfAnyChain => {
20622060
git_chain.display_branch_not_part_of_chain_error(&branch_name);
20632061
process::exit(1);
20642062
}

0 commit comments

Comments
 (0)