Skip to content

Commit fab9c62

Browse files
Bump cwextab (#113)
* Bump cwextab * Updated cwextab to not error on null actions
1 parent 08cd768 commit fab9c62

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objdiff-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ gimli = { version = "0.31", default-features = false, features = ["read-all"], o
6060

6161
# ppc
6262
cwdemangle = { version = "1.0", optional = true }
63-
cwextab = { version = "0.3", optional = true }
63+
cwextab = { version = "1.0.1", optional = true }
6464
ppc750cl = { version = "0.3", optional = true }
6565

6666
# mips

objdiff-gui/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bytes = "1.7"
2929
cfg-if = "1.0"
3030
const_format = "0.2"
3131
cwdemangle = "1.0"
32-
cwextab = "0.3.1"
32+
cwextab = "1.0.1"
3333
dirs = "5.0"
3434
egui = "0.29"
3535
egui_extras = "0.29"

objdiff-gui/src/views/extab_diff.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ fn find_symbol(obj: &ObjInfo, selected_symbol: &SymbolRefByName) -> Option<Symbo
2626
fn decode_extab(extab: &ExceptionInfo) -> String {
2727
let mut text = String::from("");
2828

29-
let mut dtor_names: Vec<&str> = vec![];
29+
let mut dtor_names: Vec<String> = vec![];
3030
for dtor in &extab.dtors {
3131
//For each function name, use the demangled name by default,
3232
//and if not available fallback to the original name
33-
let name = match &dtor.demangled_name {
34-
Some(demangled_name) => demangled_name,
35-
None => &dtor.name,
33+
let name: String = match &dtor.demangled_name {
34+
Some(demangled_name) => demangled_name.to_string(),
35+
None => dtor.name.clone(),
3636
};
37-
dtor_names.push(name.as_str());
37+
dtor_names.push(name);
3838
}
39-
if let Some(decoded) = extab.data.to_string(&dtor_names) {
39+
if let Some(decoded) = extab.data.to_string(dtor_names) {
4040
text += decoded.as_str();
4141
}
4242

0 commit comments

Comments
 (0)