@@ -25,11 +25,6 @@ use crate::{
25
25
} ,
26
26
} ;
27
27
28
- #[ derive( Clone , Copy , Debug ) ]
29
- enum SelectedSymbol {
30
- Symbol ( usize ) ,
31
- }
32
-
33
28
#[ derive( Clone , Copy ) ]
34
29
struct DiffColumnContext < ' a > {
35
30
status : & ' a BuildStatus ,
@@ -44,17 +39,15 @@ impl<'a> DiffColumnContext<'a> {
44
39
obj : Option < & ' a ( Object , ObjectDiff ) > ,
45
40
selected_symbol : Option < & SymbolRefByName > ,
46
41
) -> Self {
47
- let selected_symbol = match view {
42
+ let selected_symbol_idx = match view {
48
43
View :: SymbolDiff => None ,
49
44
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 ) ,
53
46
_ => None ,
54
47
} ,
55
48
} ;
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) ) => {
58
51
let symbol = & obj. symbols [ symbol_ref] ;
59
52
Some ( ( symbol, & obj_diff. symbols [ symbol_ref] , symbol_ref) )
60
53
}
0 commit comments