Skip to content

Commit 100f8f8

Browse files
encounterencounter
committed
Update all dependencies
1 parent 2f77893 commit 100f8f8

File tree

10 files changed

+1214
-840
lines changed

10 files changed

+1214
-840
lines changed

‎Cargo.lock

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

‎Cargo.toml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "objdiff"
3-
version = "0.3.1"
3+
version = "0.3.2"
44
edition = "2021"
55
rust-version = "1.65"
66
authors = ["Luke Street <[email protected]>"]
@@ -11,6 +11,7 @@ description = """
1111
A local diffing tool for decompilation projects.
1212
"""
1313
publish = false
14+
build = "build.rs"
1415

1516
[profile.release]
1617
lto = "thin"
@@ -21,40 +22,40 @@ default = []
2122
wgpu = ["eframe/wgpu"]
2223

2324
[dependencies]
24-
anyhow = "1.0.68"
25-
bytes = "1.3.0"
25+
anyhow = "1.0.71"
26+
bytes = "1.4.0"
2627
cfg-if = "1.0.0"
2728
const_format = "0.2.30"
2829
cwdemangle = "0.1.5"
29-
eframe = { version = "0.20.1", features = ["persistence"] }
30-
egui = "0.20.1"
31-
egui_extras = "0.20.0"
30+
eframe = { version = "0.21.3", features = ["persistence"] }
31+
egui = "0.21.0"
32+
egui_extras = "0.21.0"
3233
flagset = "0.4.3"
3334
log = "0.4.17"
34-
memmap2 = "0.5.8"
35-
notify = "5.0.0"
36-
object = { version = "0.30.2", features = ["read_core", "std", "elf"], default-features = false }
37-
png = "0.17.7"
35+
memmap2 = "0.6.1"
36+
notify = "5.1.0"
37+
object = { version = "0.31.1", features = ["read_core", "std", "elf"], default-features = false }
38+
png = "0.17.8"
3839
ppc750cl = { git = "https://github.com/terorie/ppc750cl", rev = "9ae36eef34aa6d74e00972c7671f547a2acfd0aa" }
39-
rabbitizer = "1.5.8"
40-
rfd = { version = "0.10.0" } #, default-features = false, features = ['xdg-portal']
40+
rabbitizer = "1.7.1"
41+
rfd = { version = "0.11.3" } #, default-features = false, features = ['xdg-portal']
4142
serde = { version = "1", features = ["derive"] }
42-
tempfile = "3.3.0"
43-
thiserror = "1.0.38"
44-
time = { version = "0.3.17", features = ["formatting", "local-offset"] }
45-
toml = "0.5.11"
43+
tempfile = "3.5.0"
44+
thiserror = "1.0.40"
45+
time = { version = "0.3.21", features = ["formatting", "local-offset"] }
46+
toml = "0.7.3"
4647
twox-hash = "1.6.3"
4748
byteorder = "1.4.3"
4849

4950
# For Linux static binaries, use rustls
5051
[target.'cfg(target_os = "linux")'.dependencies]
51-
reqwest = { version = "0.11.14", default-features = false, features = ["blocking", "json", "rustls"] }
52-
self_update = { version = "0.34.0", default-features = false, features = ["rustls"] }
52+
reqwest = { version = "0.11.17", default-features = false, features = ["blocking", "json", "rustls"] }
53+
self_update = { version = "0.36.0", default-features = false, features = ["rustls"] }
5354

5455
# For all other platforms, use native TLS
5556
[target.'cfg(not(target_os = "linux"))'.dependencies]
56-
reqwest = "0.11.14"
57-
self_update = "0.34.0"
57+
reqwest = "0.11.17"
58+
self_update = "0.36.0"
5859

5960
[target.'cfg(windows)'.dependencies]
6061
path-slash = "0.2.1"
@@ -76,5 +77,5 @@ console_error_panic_hook = "0.1.7"
7677
tracing-wasm = "0.2"
7778

7879
[build-dependencies]
79-
anyhow = "1.0.68"
80-
vergen = { version = "7.5.0", features = ["build", "cargo", "git"], default-features = false }
80+
anyhow = "1.0.71"
81+
vergen = { version = "8.1.3", features = ["build", "cargo", "git", "gitcl"] }

‎build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use anyhow::Result;
2-
use vergen::{vergen, Config};
2+
use vergen::EmitBuilder;
33

44
fn main() -> Result<()> {
55
#[cfg(windows)]
66
{
77
winres::WindowsResource::new().set_icon("assets/icon.ico").compile()?;
88
}
9-
vergen(Config::default())
9+
EmitBuilder::builder().fail_on_error().all_build().all_cargo().all_git().emit()
1010
}

‎src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ impl eframe::App for App {
362362
ui.colored_label(Color32::LIGHT_BLUE, &demangled);
363363
});
364364
if ui.button("Copy").clicked() {
365-
ui.output().copied_text = demangled;
365+
ui.output_mut(|output| output.copied_text = demangled);
366366
}
367367
} else {
368368
ui.scope(|ui| {

‎src/editops.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,15 @@ where T: PartialEq {
7676
cache_matrix[current + 1 + p] = x;
7777
}
7878
}
79-
editops_from_cost_matrix::<T>(matrix_columns, matrix_rows, prefix_len, cache_matrix)
79+
editops_from_cost_matrix(matrix_columns, matrix_rows, prefix_len, cache_matrix)
8080
}
8181

82-
fn editops_from_cost_matrix<T>(
82+
fn editops_from_cost_matrix(
8383
len1: usize,
8484
len2: usize,
8585
prefix_len: usize,
8686
cache_matrix: Vec<usize>,
87-
) -> Vec<LevEditOp>
88-
where
89-
T: PartialEq,
90-
{
87+
) -> Vec<LevEditOp> {
9188
let mut ops = Vec::with_capacity(cache_matrix[len1 * len2 - 1]);
9289
let mut dir = 0;
9390
let mut i = len1 - 1;

‎src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ fn main() {
5454
"objdiff",
5555
native_options,
5656
Box::new(move |cc| Box::new(objdiff::App::new(cc, utc_offset, exec_path_clone))),
57-
);
57+
)
58+
.expect("Failed to run eframe application");
5859

5960
// Attempt to relaunch application from the updated path
6061
if let Ok(mut guard) = exec_path.lock() {

‎src/obj/elf.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ fn symbols_by_section(obj_file: &File<'_>, section: &ObjSection) -> Result<Vec<O
126126
}
127127

128128
fn common_symbols(obj_file: &File<'_>) -> Result<Vec<ObjSymbol>> {
129-
obj_file.symbols()
129+
obj_file
130+
.symbols()
130131
.filter(Symbol::is_common)
131132
.map(|symbol| to_obj_symbol(obj_file, &symbol, 0))
132133
.collect::<Result<Vec<ObjSymbol>>>()

‎src/views/config.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub fn config_ui(ui: &mut egui::Ui, config: &Arc<RwLock<AppConfig>>, view_state:
7474
ui.label(formatcp!("Git branch: {}", env!("VERGEN_GIT_BRANCH")));
7575
ui.label(formatcp!("Git commit: {}", env!("VERGEN_GIT_SHA")));
7676
ui.label(formatcp!("Build target: {}", env!("VERGEN_CARGO_TARGET_TRIPLE")));
77-
ui.label(formatcp!("Build type: {}", env!("VERGEN_CARGO_PROFILE")));
77+
ui.label(formatcp!("Debug: {}", env!("VERGEN_CARGO_DEBUG")));
7878
});
7979
if let Some(state) = &view_state.check_update {
8080
ui.label(format!("Latest version: {}", state.latest_release.version));
@@ -96,8 +96,10 @@ pub fn config_ui(ui: &mut egui::Ui, config: &Arc<RwLock<AppConfig>>, view_state:
9696
.on_hover_text_at_pointer("Open a link to the latest release on GitHub")
9797
.clicked()
9898
{
99-
ui.output().open_url =
100-
Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true });
99+
ui.output_mut(|output| {
100+
output.open_url =
101+
Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true })
102+
});
101103
}
102104
});
103105
}

‎src/views/function_diff.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,31 +226,31 @@ fn ins_context_menu(ui: &mut egui::Ui, ins: &ObjIns) {
226226
match arg {
227227
Argument::Uimm(v) => {
228228
if ui.button(format!("Copy \"{v}\"")).clicked() {
229-
ui.output().copied_text = format!("{v}");
229+
ui.output_mut(|output| output.copied_text = format!("{v}"));
230230
ui.close_menu();
231231
}
232232
if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
233-
ui.output().copied_text = format!("{}", v.0);
233+
ui.output_mut(|output| output.copied_text = format!("{}", v.0));
234234
ui.close_menu();
235235
}
236236
}
237237
Argument::Simm(v) => {
238238
if ui.button(format!("Copy \"{v}\"")).clicked() {
239-
ui.output().copied_text = format!("{v}");
239+
ui.output_mut(|output| output.copied_text = format!("{v}"));
240240
ui.close_menu();
241241
}
242242
if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
243-
ui.output().copied_text = format!("{}", v.0);
243+
ui.output_mut(|output| output.copied_text = format!("{}", v.0));
244244
ui.close_menu();
245245
}
246246
}
247247
Argument::Offset(v) => {
248248
if ui.button(format!("Copy \"{v}\"")).clicked() {
249-
ui.output().copied_text = format!("{v}");
249+
ui.output_mut(|output| output.copied_text = format!("{v}"));
250250
ui.close_menu();
251251
}
252252
if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
253-
ui.output().copied_text = format!("{}", v.0);
253+
ui.output_mut(|output| output.copied_text = format!("{}", v.0));
254254
ui.close_menu();
255255
}
256256
}
@@ -261,12 +261,12 @@ fn ins_context_menu(ui: &mut egui::Ui, ins: &ObjIns) {
261261
if let Some(reloc) = &ins.reloc {
262262
if let Some(name) = &reloc.target.demangled_name {
263263
if ui.button(format!("Copy \"{name}\"")).clicked() {
264-
ui.output().copied_text = name.clone();
264+
ui.output_mut(|output| output.copied_text = name.clone());
265265
ui.close_menu();
266266
}
267267
}
268268
if ui.button(format!("Copy \"{}\"", reloc.target.name)).clicked() {
269-
ui.output().copied_text = reloc.target.name.clone();
269+
ui.output_mut(|output| output.copied_text = reloc.target.name.clone());
270270
ui.close_menu();
271271
}
272272
}

‎src/views/symbol_diff.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ fn symbol_context_menu_ui(ui: &mut Ui, symbol: &ObjSymbol) {
2828

2929
if let Some(name) = &symbol.demangled_name {
3030
if ui.button(format!("Copy \"{name}\"")).clicked() {
31-
ui.output().copied_text = name.clone();
31+
ui.output_mut(|output| output.copied_text = name.clone());
3232
ui.close_menu();
3333
}
3434
}
3535
if ui.button(format!("Copy \"{}\"", symbol.name)).clicked() {
36-
ui.output().copied_text = symbol.name.clone();
36+
ui.output_mut(|output| output.copied_text = symbol.name.clone());
3737
ui.close_menu();
3838
}
3939
});
@@ -282,9 +282,9 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
282282
strip.strip(|builder| {
283283
builder.sizes(Size::remainder(), 2).horizontal(|mut strip| {
284284
strip.cell(|ui| {
285-
if result.first_status.success {
286-
if let Some(obj) = &result.first_obj {
287-
ui.push_id("left", |ui| {
285+
ui.push_id("left", |ui| {
286+
if result.first_status.success {
287+
if let Some(obj) = &result.first_obj {
288288
symbol_list_ui(
289289
ui,
290290
obj,
@@ -294,16 +294,16 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
294294
&lower_search,
295295
&view_state.view_config,
296296
);
297-
});
297+
}
298+
} else {
299+
build_log_ui(ui, &result.first_status);
298300
}
299-
} else {
300-
build_log_ui(ui, &result.first_status);
301-
}
301+
});
302302
});
303303
strip.cell(|ui| {
304-
if result.second_status.success {
305-
if let Some(obj) = &result.second_obj {
306-
ui.push_id("right", |ui| {
304+
ui.push_id("right", |ui| {
305+
if result.second_status.success {
306+
if let Some(obj) = &result.second_obj {
307307
symbol_list_ui(
308308
ui,
309309
obj,
@@ -313,11 +313,11 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
313313
&lower_search,
314314
&view_state.view_config,
315315
);
316-
});
316+
}
317+
} else {
318+
build_log_ui(ui, &result.second_status);
317319
}
318-
} else {
319-
build_log_ui(ui, &result.second_status);
320-
}
320+
});
321321
});
322322
});
323323
});

0 commit comments

Comments
 (0)