Skip to content

Commit 5b07c48

Browse files
author
Stephan Dilly
committed
nightly clippy fixes
1 parent 6006e7a commit 5b07c48

39 files changed

+96
-108
lines changed

‎asyncgit/src/revlog.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl AsyncLog {
8383

8484
///
8585
pub fn set_background(&mut self) {
86-
self.background.store(true, Ordering::Relaxed)
86+
self.background.store(true, Ordering::Relaxed);
8787
}
8888

8989
///

‎asyncgit/src/sync/diff.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ fn raw_diff_to_file_diff<'a>(
245245
if h != hunk_header {
246246
adder(&h, &current_lines);
247247
current_lines.clear();
248-
current_hunk = Some(hunk_header)
248+
current_hunk = Some(hunk_header);
249249
}
250250
}
251251
}

‎asyncgit/src/sync/stash.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub fn stash_save(
118118
options.insert(StashFlags::INCLUDE_UNTRACKED);
119119
}
120120
if keep_index {
121-
options.insert(StashFlags::KEEP_INDEX)
121+
options.insert(StashFlags::KEEP_INDEX);
122122
}
123123

124124
let id = repo.stash_save2(&sig, message, Some(options))?;

‎asyncgit/src/sync/tags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn get_tags(repo_path: &str) -> Result<Tags> {
3131
let mut res = Tags::new();
3232
let mut adder = |key, value: String| {
3333
if let Some(key) = res.get_mut(&key) {
34-
key.push(value)
34+
key.push(value);
3535
} else {
3636
res.insert(key, vec![value]);
3737
}

‎filetreelist/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl FileTreeItem {
143143
*folded = folded.join(next.info.path());
144144
} else {
145145
self.info.folded =
146-
Some(self.info.path().join(next.info.path()))
146+
Some(self.info.path().join(next.info.path()));
147147
}
148148

149149
self.info.full_path = next.info.full_path;

‎src/app.rs

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ impl App {
328328
pub fn update(&mut self) -> Result<()> {
329329
log::trace!("update");
330330

331-
self.commit.update()?;
331+
self.commit.update();
332332
self.status_tab.update()?;
333333
self.revlog.update()?;
334334
self.files_tab.update()?;
@@ -349,7 +349,7 @@ impl App {
349349

350350
self.status_tab.update_git(ev)?;
351351
self.stashing_tab.update_git(ev)?;
352-
self.files_tab.update_git(ev)?;
352+
self.files_tab.update_git(ev);
353353
self.revlog.update_git(ev)?;
354354
self.blame_file_popup.update_git(ev)?;
355355
self.inspect_commit_popup.update_git(ev)?;
@@ -482,15 +482,15 @@ impl App {
482482

483483
fn switch_tab(&mut self, k: KeyEvent) -> Result<()> {
484484
if k == self.key_config.tab_status {
485-
self.set_tab(0)?
485+
self.set_tab(0)?;
486486
} else if k == self.key_config.tab_log {
487-
self.set_tab(1)?
487+
self.set_tab(1)?;
488488
} else if k == self.key_config.tab_files {
489-
self.set_tab(2)?
489+
self.set_tab(2)?;
490490
} else if k == self.key_config.tab_stashing {
491-
self.set_tab(3)?
491+
self.set_tab(3)?;
492492
} else if k == self.key_config.tab_stashes {
493-
self.set_tab(4)?
493+
self.set_tab(4)?;
494494
}
495495

496496
Ok(())
@@ -578,14 +578,15 @@ impl App {
578578
InternalEvent::OpenCommit => self.commit.show()?,
579579
InternalEvent::PopupStashing(opts) => {
580580
self.stashmsg_popup.options(opts);
581-
self.stashmsg_popup.show()?
581+
self.stashmsg_popup.show()?;
582582
}
583583
InternalEvent::TagCommit(id) => {
584584
self.tag_commit_popup.open(id)?;
585585
}
586586
InternalEvent::BlameFile(path) => {
587587
self.blame_file_popup.open(&path)?;
588-
flags.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS)
588+
flags
589+
.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
589590
}
590591
InternalEvent::CreateBranch => {
591592
self.create_branch_popup.open()?;
@@ -603,44 +604,46 @@ impl App {
603604
InternalEvent::TabSwitch => self.set_tab(0)?,
604605
InternalEvent::InspectCommit(id, tags) => {
605606
self.inspect_commit_popup.open(id, tags)?;
606-
flags.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS)
607+
flags
608+
.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
607609
}
608610
InternalEvent::SelectCommitInRevlog(id) => {
609611
if let Err(error) = self.revlog.select_commit(id) {
610612
self.queue.borrow_mut().push_back(
611613
InternalEvent::ShowErrorMsg(
612614
error.to_string(),
613615
),
614-
)
616+
);
615617
} else {
616618
self.tags_popup.hide();
617-
flags.insert(NeedsUpdate::ALL)
619+
flags.insert(NeedsUpdate::ALL);
618620
}
619621
}
620622
InternalEvent::OpenExternalEditor(path) => {
621623
self.input.set_polling(false);
622624
self.external_editor_popup.show()?;
623625
self.file_to_open = path;
624-
flags.insert(NeedsUpdate::COMMANDS)
626+
flags.insert(NeedsUpdate::COMMANDS);
625627
}
626628
InternalEvent::Push(branch, force) => {
627629
self.push_popup.push(branch, force)?;
628-
flags.insert(NeedsUpdate::ALL)
630+
flags.insert(NeedsUpdate::ALL);
629631
}
630632
InternalEvent::Pull(branch) => {
631633
self.pull_popup.fetch(branch)?;
632-
flags.insert(NeedsUpdate::ALL)
634+
flags.insert(NeedsUpdate::ALL);
633635
}
634636
InternalEvent::PushTags => {
635637
self.push_tags_popup.push_tags()?;
636-
flags.insert(NeedsUpdate::ALL)
638+
flags.insert(NeedsUpdate::ALL);
637639
}
638640
InternalEvent::StatusLastFileMoved => {
639641
self.status_tab.last_file_moved()?;
640642
}
641643
InternalEvent::OpenFileTree(c) => {
642644
self.revision_files_popup.open(c)?;
643-
flags.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS)
645+
flags
646+
.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
644647
}
645648
};
646649

@@ -676,7 +679,7 @@ impl App {
676679
{
677680
self.queue.borrow_mut().push_back(
678681
InternalEvent::ShowErrorMsg(e.to_string()),
679-
)
682+
);
680683
} else {
681684
flags.insert(NeedsUpdate::ALL);
682685
self.select_branch_popup.update_branches()?;
@@ -688,7 +691,7 @@ impl App {
688691
InternalEvent::ShowErrorMsg(
689692
error.to_string(),
690693
),
691-
)
694+
);
692695
} else {
693696
flags.insert(NeedsUpdate::ALL);
694697
self.tags_popup.update_tags()?;

‎src/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn process_cmdline() -> Result<CliArgs> {
4949

5050
let arg_matches = app.get_matches();
5151
if arg_matches.is_present("bugreport") {
52-
bug_report::generate_bugreport()?;
52+
bug_report::generate_bugreport();
5353
std::process::exit(0);
5454
}
5555
if arg_matches.is_present("logging") {

‎src/bug_report.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use anyhow::Result;
21
use bugreport::{
32
bugreport,
43
collector::{
@@ -8,7 +7,7 @@ use bugreport::{
87
format::Markdown,
98
};
109

11-
pub fn generate_bugreport() -> Result<()> {
10+
pub fn generate_bugreport() {
1211
bugreport!()
1312
.info(SoftwareVersion::default())
1413
.info(OperatingSystem::default())
@@ -21,5 +20,4 @@ pub fn generate_bugreport() -> Result<()> {
2120
]))
2221
.info(CommandLine::default())
2322
.print::<Markdown>();
24-
Ok(())
2523
}

‎src/components/blame_file.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ impl Component for BlameFileComponent {
231231
}
232232

233233
fn hide(&mut self) {
234-
self.visible = false
234+
self.visible = false;
235235
}
236236

237237
fn show(&mut self) -> Result<()> {
@@ -288,7 +288,7 @@ impl BlameFileComponent {
288288
) -> Result<()> {
289289
if self.is_visible() {
290290
if let AsyncNotification::Blame = event {
291-
self.update()?
291+
self.update()?;
292292
}
293293
}
294294

‎src/components/branchlist.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl Component for BranchListComponent {
173173
if self.visible {
174174
if let Event::Key(e) = ev {
175175
if e == self.key_config.exit_popup {
176-
self.hide()
176+
self.hide();
177177
} else if e == self.key_config.move_down {
178178
return self
179179
.move_selection(ScrollType::Up)
@@ -259,7 +259,7 @@ impl Component for BranchListComponent {
259259
}
260260

261261
fn hide(&mut self) {
262-
self.visible = false
262+
self.visible = false;
263263
}
264264

265265
fn show(&mut self) -> Result<()> {
@@ -490,7 +490,7 @@ impl BranchListComponent {
490490
asyncgit::CWD,
491491
&self.branches[self.selection as usize].reference,
492492
)?;
493-
self.hide()
493+
self.hide();
494494
} else {
495495
checkout_remote_branch(
496496
CWD,

0 commit comments

Comments
 (0)