Skip to content

Commit cb0f24b

Browse files
committed
Remove SelectedSymbol enum as it only has a single variant now
1 parent e2a32d0 commit cb0f24b

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

objdiff-gui/src/views/diff.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ use crate::{
2525
},
2626
};
2727

28-
#[derive(Clone, Copy, Debug)]
29-
enum SelectedSymbol {
30-
Symbol(usize),
31-
}
32-
3328
#[derive(Clone, Copy)]
3429
struct DiffColumnContext<'a> {
3530
status: &'a BuildStatus,
@@ -44,17 +39,15 @@ impl<'a> DiffColumnContext<'a> {
4439
obj: Option<&'a (Object, ObjectDiff)>,
4540
selected_symbol: Option<&SymbolRefByName>,
4641
) -> Self {
47-
let selected_symbol = match view {
42+
let selected_symbol_idx = match view {
4843
View::SymbolDiff => None,
4944
View::FunctionDiff | View::DataDiff | View::ExtabDiff => match (obj, selected_symbol) {
50-
(Some(obj), Some(s)) => {
51-
obj.0.symbol_by_name(&s.symbol_name).map(SelectedSymbol::Symbol)
52-
}
45+
(Some(obj), Some(s)) => obj.0.symbol_by_name(&s.symbol_name),
5346
_ => None,
5447
},
5548
};
56-
let symbol = match (obj, selected_symbol) {
57-
(Some((obj, obj_diff)), Some(SelectedSymbol::Symbol(symbol_ref))) => {
49+
let symbol = match (obj, selected_symbol_idx) {
50+
(Some((obj, obj_diff)), Some(symbol_ref)) => {
5851
let symbol = &obj.symbols[symbol_ref];
5952
Some((symbol, &obj_diff.symbols[symbol_ref], symbol_ref))
6053
}

0 commit comments

Comments
 (0)