Skip to content

Commit 2eafbb2

Browse files
encounterencounter
committed
Update all dependencies
1 parent a1f2a53 commit 2eafbb2

File tree

13 files changed

+437
-374
lines changed

13 files changed

+437
-374
lines changed

‎Cargo.lock

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

‎deny.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ allow = [
101101
"Zlib",
102102
"0BSD",
103103
"OFL-1.1",
104-
"LicenseRef-UFL-1.0",
105-
"OpenSSL",
104+
"Ubuntu-font-1.0",
106105
]
107106
# The confidence threshold for detecting a license from license text.
108107
# The higher the value, the more closely the license text must be to the

‎objdiff-core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ ppc750cl = { version = "0.3", optional = true }
143143
rlwinmdec = { version = "1.1", optional = true, git = "https://github.com/CelestialAmber/rlwinmdec.git" }
144144

145145
# mips
146-
rabbitizer = { git = "https://github.com/Decompollaborate/rabbitizer.git", branch = "🦀", default-features = false, optional = true }
146+
rabbitizer = { git = "https://github.com/Decompollaborate/rabbitizer.git", branch = "🦀", default-features = false, features = ["all_extensions"], optional = true }
147147

148148
# x86
149149
cpp_demangle = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
@@ -162,7 +162,7 @@ yaxpeax-arm = { version = "0.3", default-features = false, optional = true }
162162
notify = { version = "8.0.0", optional = true }
163163
notify-debouncer-full = { version = "0.5.0", optional = true }
164164
shell-escape = { version = "0.1", optional = true }
165-
tempfile = { version = "3.15", optional = true }
165+
tempfile = { version = "3.17", optional = true }
166166
time = { version = "0.3", optional = true }
167167

168168
[target.'cfg(windows)'.dependencies]

‎objdiff-core/src/arch/mips.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl ArchMips {
5555
};
5656
isa_extension = match e_flags & EF_MIPS_MACH {
5757
EF_MIPS_MACH_ALLEGREX => Some(IsaExtension::R4000ALLEGREX),
58-
EF_MIPS_MACH_5900 => Some(IsaExtension::R5900),
58+
EF_MIPS_MACH_5900 => Some(IsaExtension::R5900EE),
5959
_ => None,
6060
};
6161
}
@@ -83,7 +83,7 @@ impl ArchMips {
8383
MipsInstrCategory::Rsp => Some(IsaExtension::RSP),
8484
MipsInstrCategory::R3000gte => Some(IsaExtension::R3000GTE),
8585
MipsInstrCategory::R4000allegrex => Some(IsaExtension::R4000ALLEGREX),
86-
MipsInstrCategory::R5900 => Some(IsaExtension::R5900),
86+
MipsInstrCategory::R5900 => Some(IsaExtension::R5900EE),
8787
};
8888
match isa_extension {
8989
Some(extension) => rabbitizer::InstructionFlags::new_extension(extension),

‎objdiff-gui/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ cfg-if = "1.0"
2929
const_format = "0.2"
3030
cwdemangle = "1.0"
3131
cwextab = { version = "1.0", git = "https://github.com/CelestialAmber/cwextab.git" }
32-
dirs = "5.0"
33-
egui = "0.30"
34-
egui_extras = "0.30"
32+
dirs = "6.0"
33+
egui = "0.31"
34+
egui_extras = "0.31"
3535
filetime = "0.2"
3636
float-ord = "0.3"
3737
font-kit = "0.14"
@@ -55,7 +55,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
5555

5656
# Keep version in sync with egui
5757
[dependencies.eframe]
58-
version = "0.30"
58+
version = "0.31"
5959
features = [
6060
"default_fonts",
6161
"persistence",
@@ -66,7 +66,7 @@ default-features = false
6666

6767
# Keep version in sync with eframe
6868
[dependencies.wgpu]
69-
version = "23.0"
69+
version = "24.0"
7070
features = [
7171
"dx12",
7272
"metal",
@@ -85,4 +85,4 @@ exec = "0.3"
8585
anyhow = "1.0"
8686

8787
[target.'cfg(windows)'.build-dependencies]
88-
tauri-winres = "0.2"
88+
tauri-winres = "0.3"

‎objdiff-gui/src/main.rs

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,26 +86,18 @@ fn main() -> ExitCode {
8686
}
8787
#[cfg(feature = "wgpu")]
8888
{
89-
use eframe::egui_wgpu::{wgpu::Backends, WgpuSetup};
89+
use eframe::egui_wgpu::{wgpu, WgpuSetup};
9090
if graphics_config.desired_backend.is_supported() {
9191
native_options.wgpu_options.wgpu_setup = match native_options.wgpu_options.wgpu_setup {
92-
WgpuSetup::CreateNew {
93-
supported_backends: backends,
94-
power_preference,
95-
device_descriptor,
96-
} => {
97-
let backend = match graphics_config.desired_backend {
98-
GraphicsBackend::Auto => backends,
99-
GraphicsBackend::Dx12 => Backends::DX12,
100-
GraphicsBackend::Metal => Backends::METAL,
101-
GraphicsBackend::Vulkan => Backends::VULKAN,
102-
GraphicsBackend::OpenGL => Backends::GL,
92+
WgpuSetup::CreateNew(mut setup) => {
93+
setup.instance_descriptor.backends = match graphics_config.desired_backend {
94+
GraphicsBackend::Auto => setup.instance_descriptor.backends,
95+
GraphicsBackend::Dx12 => wgpu::Backends::DX12,
96+
GraphicsBackend::Metal => wgpu::Backends::METAL,
97+
GraphicsBackend::Vulkan => wgpu::Backends::VULKAN,
98+
GraphicsBackend::OpenGL => wgpu::Backends::GL,
10399
};
104-
WgpuSetup::CreateNew {
105-
supported_backends: backend,
106-
power_preference,
107-
device_descriptor,
108-
}
100+
WgpuSetup::CreateNew(setup)
109101
}
110102
// WgpuConfiguration::Default is CreateNew until we call run_eframe()
111103
_ => unreachable!(),

‎objdiff-gui/src/views/config.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,7 @@ pub fn config_ui(
201201
.on_hover_text_at_pointer("Open a link to the latest release on GitHub")
202202
.clicked()
203203
{
204-
ui.output_mut(|output| {
205-
output.open_url =
206-
Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true })
207-
});
204+
ui.ctx().open_url(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true });
208205
}
209206
});
210207
}

‎objdiff-gui/src/views/demangle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn demangle_window(
2222
ui.colored_label(appearance.replace_color, &demangled);
2323
});
2424
if ui.button("Copy").clicked() {
25-
ui.output_mut(|output| output.copied_text = demangled);
25+
ctx.copy_text(demangled);
2626
}
2727
} else {
2828
ui.scope(|ui| {

‎objdiff-gui/src/views/diff.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -734,12 +734,10 @@ fn build_log_ui(ui: &mut Ui, status: &BuildStatus, appearance: &Appearance) {
734734
ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| {
735735
ui.horizontal(|ui| {
736736
if !status.cmdline.is_empty() && ui.button("Copy command").clicked() {
737-
ui.output_mut(|output| output.copied_text.clone_from(&status.cmdline));
737+
ui.ctx().copy_text(status.cmdline.clone());
738738
}
739739
if ui.button("Copy log").clicked() {
740-
ui.output_mut(|output| {
741-
output.copied_text = format!("{}\n{}", status.stdout, status.stderr)
742-
});
740+
ui.ctx().copy_text(format!("{}\n{}", status.stdout, status.stderr));
743741
}
744742
});
745743
ui.scope(|ui| {
@@ -842,7 +840,7 @@ pub fn context_menu_items_ui(
842840
write_text(")", appearance.text_color, &mut job, appearance.code_font.clone());
843841
}
844842
if ui.button(job).clicked() {
845-
ui.output_mut(|output| output.copied_text = value);
843+
ui.ctx().copy_text(value);
846844
ui.close_menu();
847845
}
848846
}

‎objdiff-gui/src/views/frame_history.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ impl FrameHistory {
8686
let mut shapes = Vec::with_capacity(3 + 2 * history.len());
8787
shapes.push(Shape::Rect(epaint::RectShape::new(
8888
rect,
89-
style.rounding,
89+
style.corner_radius,
9090
ui.visuals().extreme_bg_color,
9191
ui.style().noninteractive().bg_stroke,
92+
StrokeKind::Inside,
9293
)));
9394

9495
let rect = rect.shrink(4.0);

‎objdiff-gui/src/views/jobs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
4949
.on_hover_text_at_pointer(RichText::new(&err_string).color(appearance.delete_color))
5050
.context_menu(|ui| {
5151
if ui.button("Copy full message").clicked() {
52-
ui.output_mut(|o| o.copied_text = err_string);
52+
ui.ctx().copy_text(err_string);
5353
}
5454
});
5555
} else {
@@ -61,7 +61,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
6161
.on_hover_text_at_pointer(&status.status)
6262
.context_menu(|ui| {
6363
if ui.button("Copy full message").clicked() {
64-
ui.output_mut(|o| o.copied_text = status.status.clone());
64+
ui.ctx().copy_text(status.status.clone());
6565
}
6666
});
6767
}

‎objdiff-gui/src/views/rlwinm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn rlwinm_decode_window(
2222
ui.colored_label(appearance.replace_color, decoded.trim());
2323
});
2424
if ui.button("Copy").clicked() {
25-
ui.output_mut(|output| output.copied_text = decoded);
25+
ctx.copy_text(decoded);
2626
}
2727
} else {
2828
ui.scope(|ui| {

‎objdiff-gui/src/views/symbol_diff.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl DiffViewState {
183183
state: &AppStateRef,
184184
) {
185185
if let Some(result) = take(&mut self.scratch) {
186-
ctx.output_mut(|o| o.open_url = Some(OpenUrl::new_tab(result.scratch_url)));
186+
ctx.open_url(OpenUrl::new_tab(result.scratch_url));
187187
}
188188

189189
// Clear the autoscroll flag so that it doesn't scroll continuously.

0 commit comments

Comments
 (0)