Skip to content

Commit ff618a0

Browse files
committed
Cleanup
1 parent daa7bac commit ff618a0

3 files changed

Lines changed: 23 additions & 28 deletions

File tree

objdiff-core/src/jobs/find_similar.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ fn run_find_similar(
136136
};
137137
let Some(path) = path else { continue };
138138

139-
if should_build
140-
&& let Some(project_dir) = project_dir {
139+
if should_build && let Some(project_dir) = project_dir {
141140
if let Ok(rel_path) = path.strip_prefix(project_dir) {
142141
run_make(&config.build_config, rel_path.with_unix_encoding().as_ref());
143142
}

objdiff-gui/src/views/diff.rs

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ pub fn diff_view_ui(
204204
);
205205
ui.horizontal(|ui| {
206206
let mut search = sim.search.clone();
207-
let response =
208-
TextEdit::singleline(&mut search).hint_text("Filter symbols").ui(ui);
207+
let response = TextEdit::singleline(&mut search).hint_text("Filter symbols").ui(ui);
209208
if hotkeys::consume_symbol_filter_shortcut(ui.ctx()) {
210209
response.request_focus();
211210
}
@@ -228,21 +227,21 @@ pub fn diff_view_ui(
228227
.add(Slider::new(&mut min, 0.0..=sim.max_percent).suffix("%").fixed_decimals(0))
229228
.changed()
230229
{
231-
ret = Some(DiffViewAction::SetSimilarPercentRange {
232-
min,
233-
max: sim.max_percent,
234-
});
230+
ret =
231+
Some(DiffViewAction::SetSimilarPercentRange { min, max: sim.max_percent });
235232
}
236233
ui.label("Max:");
237234
let mut max = sim.max_percent;
238235
if ui
239-
.add(Slider::new(&mut max, sim.min_percent..=100.0).suffix("%").fixed_decimals(0))
236+
.add(
237+
Slider::new(&mut max, sim.min_percent..=100.0)
238+
.suffix("%")
239+
.fixed_decimals(0),
240+
)
240241
.changed()
241242
{
242-
ret = Some(DiffViewAction::SetSimilarPercentRange {
243-
min: sim.min_percent,
244-
max,
245-
});
243+
ret =
244+
Some(DiffViewAction::SetSimilarPercentRange { min: sim.min_percent, max });
246245
}
247246
});
248247
});
@@ -365,17 +364,10 @@ pub fn diff_view_ui(
365364
}
366365

367366
ui.with_layout(Layout::right_to_left(egui::Align::TOP), |ui| {
368-
if ui
369-
.small_button("⏷")
370-
.on_hover_text_at_pointer("Expand all")
371-
.clicked()
372-
{
367+
if ui.small_button("⏷").on_hover_text_at_pointer("Expand all").clicked() {
373368
open_sections.0 = Some(true);
374369
}
375-
if ui
376-
.small_button("⏶")
377-
.on_hover_text_at_pointer("Collapse all")
378-
.clicked()
370+
if ui.small_button("⏶").on_hover_text_at_pointer("Collapse all").clicked()
379371
{
380372
open_sections.0 = Some(false);
381373
}

objdiff-gui/src/views/symbol_diff.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ use objdiff_core::{
1414
},
1515
},
1616
jobs::{
17-
Job, JobQueue, JobResult,
18-
create_scratch::CreateScratchResult,
19-
find_similar::SimilarFunctionMatch,
20-
objdiff::ObjDiffResult,
17+
Job, JobQueue, JobResult, create_scratch::CreateScratchResult,
18+
find_similar::SimilarFunctionMatch, objdiff::ObjDiffResult,
2119
},
2220
obj::{Object, Section, SectionKind, Symbol, SymbolFlag},
2321
};
@@ -91,7 +89,10 @@ pub enum DiffViewAction {
9189
ScrollToRow(usize),
9290
/// Find and display code symbols similar to the given symbol.
9391
/// `column` is 0 for left object, 1 for right object.
94-
FindSimilarFunctions { symbol_idx: usize, column: usize },
92+
FindSimilarFunctions {
93+
symbol_idx: usize,
94+
column: usize,
95+
},
9596
/// Close the similar functions panel.
9697
CloseSimilarFunctions,
9798
/// Set the similar functions search filter.
@@ -101,7 +102,10 @@ pub enum DiffViewAction {
101102
/// Show/hide base-side results in the similar functions panel.
102103
SetSimilarShowBase(bool),
103104
/// Set the minimum/maximum match-percent filter for the similar functions panel.
104-
SetSimilarPercentRange { min: f32, max: f32 },
105+
SetSimilarPercentRange {
106+
min: f32,
107+
max: f32,
108+
},
105109
}
106110

107111
#[derive(Debug, Clone, Default, Eq, PartialEq)]

0 commit comments

Comments
 (0)