mirror of
https://github.com/encounter/objdiff.git
synced 2025-06-07 15:13:47 +00:00
Update all dependencies
This commit is contained in:
parent
a1f2a535e5
commit
2eafbb218b
738
Cargo.lock
generated
738
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -101,8 +101,7 @@ allow = [
|
|||||||
"Zlib",
|
"Zlib",
|
||||||
"0BSD",
|
"0BSD",
|
||||||
"OFL-1.1",
|
"OFL-1.1",
|
||||||
"LicenseRef-UFL-1.0",
|
"Ubuntu-font-1.0",
|
||||||
"OpenSSL",
|
|
||||||
]
|
]
|
||||||
# The confidence threshold for detecting a license from license text.
|
# The confidence threshold for detecting a license from license text.
|
||||||
# The higher the value, the more closely the license text must be to the
|
# The higher the value, the more closely the license text must be to the
|
||||||
|
@ -143,7 +143,7 @@ ppc750cl = { version = "0.3", optional = true }
|
|||||||
rlwinmdec = { version = "1.1", optional = true, git = "https://github.com/CelestialAmber/rlwinmdec.git" }
|
rlwinmdec = { version = "1.1", optional = true, git = "https://github.com/CelestialAmber/rlwinmdec.git" }
|
||||||
|
|
||||||
# mips
|
# mips
|
||||||
rabbitizer = { git = "https://github.com/Decompollaborate/rabbitizer.git", branch = "🦀", default-features = false, optional = true }
|
rabbitizer = { git = "https://github.com/Decompollaborate/rabbitizer.git", branch = "🦀", default-features = false, features = ["all_extensions"], optional = true }
|
||||||
|
|
||||||
# x86
|
# x86
|
||||||
cpp_demangle = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
|
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 }
|
|||||||
notify = { version = "8.0.0", optional = true }
|
notify = { version = "8.0.0", optional = true }
|
||||||
notify-debouncer-full = { version = "0.5.0", optional = true }
|
notify-debouncer-full = { version = "0.5.0", optional = true }
|
||||||
shell-escape = { version = "0.1", optional = true }
|
shell-escape = { version = "0.1", optional = true }
|
||||||
tempfile = { version = "3.15", optional = true }
|
tempfile = { version = "3.17", optional = true }
|
||||||
time = { version = "0.3", optional = true }
|
time = { version = "0.3", optional = true }
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
|
@ -55,7 +55,7 @@ impl ArchMips {
|
|||||||
};
|
};
|
||||||
isa_extension = match e_flags & EF_MIPS_MACH {
|
isa_extension = match e_flags & EF_MIPS_MACH {
|
||||||
EF_MIPS_MACH_ALLEGREX => Some(IsaExtension::R4000ALLEGREX),
|
EF_MIPS_MACH_ALLEGREX => Some(IsaExtension::R4000ALLEGREX),
|
||||||
EF_MIPS_MACH_5900 => Some(IsaExtension::R5900),
|
EF_MIPS_MACH_5900 => Some(IsaExtension::R5900EE),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -83,7 +83,7 @@ impl ArchMips {
|
|||||||
MipsInstrCategory::Rsp => Some(IsaExtension::RSP),
|
MipsInstrCategory::Rsp => Some(IsaExtension::RSP),
|
||||||
MipsInstrCategory::R3000gte => Some(IsaExtension::R3000GTE),
|
MipsInstrCategory::R3000gte => Some(IsaExtension::R3000GTE),
|
||||||
MipsInstrCategory::R4000allegrex => Some(IsaExtension::R4000ALLEGREX),
|
MipsInstrCategory::R4000allegrex => Some(IsaExtension::R4000ALLEGREX),
|
||||||
MipsInstrCategory::R5900 => Some(IsaExtension::R5900),
|
MipsInstrCategory::R5900 => Some(IsaExtension::R5900EE),
|
||||||
};
|
};
|
||||||
match isa_extension {
|
match isa_extension {
|
||||||
Some(extension) => rabbitizer::InstructionFlags::new_extension(extension),
|
Some(extension) => rabbitizer::InstructionFlags::new_extension(extension),
|
||||||
|
@ -29,9 +29,9 @@ cfg-if = "1.0"
|
|||||||
const_format = "0.2"
|
const_format = "0.2"
|
||||||
cwdemangle = "1.0"
|
cwdemangle = "1.0"
|
||||||
cwextab = { version = "1.0", git = "https://github.com/CelestialAmber/cwextab.git" }
|
cwextab = { version = "1.0", git = "https://github.com/CelestialAmber/cwextab.git" }
|
||||||
dirs = "5.0"
|
dirs = "6.0"
|
||||||
egui = "0.30"
|
egui = "0.31"
|
||||||
egui_extras = "0.30"
|
egui_extras = "0.31"
|
||||||
filetime = "0.2"
|
filetime = "0.2"
|
||||||
float-ord = "0.3"
|
float-ord = "0.3"
|
||||||
font-kit = "0.14"
|
font-kit = "0.14"
|
||||||
@ -55,7 +55,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|||||||
|
|
||||||
# Keep version in sync with egui
|
# Keep version in sync with egui
|
||||||
[dependencies.eframe]
|
[dependencies.eframe]
|
||||||
version = "0.30"
|
version = "0.31"
|
||||||
features = [
|
features = [
|
||||||
"default_fonts",
|
"default_fonts",
|
||||||
"persistence",
|
"persistence",
|
||||||
@ -66,7 +66,7 @@ default-features = false
|
|||||||
|
|
||||||
# Keep version in sync with eframe
|
# Keep version in sync with eframe
|
||||||
[dependencies.wgpu]
|
[dependencies.wgpu]
|
||||||
version = "23.0"
|
version = "24.0"
|
||||||
features = [
|
features = [
|
||||||
"dx12",
|
"dx12",
|
||||||
"metal",
|
"metal",
|
||||||
@ -85,4 +85,4 @@ exec = "0.3"
|
|||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
|
|
||||||
[target.'cfg(windows)'.build-dependencies]
|
[target.'cfg(windows)'.build-dependencies]
|
||||||
tauri-winres = "0.2"
|
tauri-winres = "0.3"
|
||||||
|
@ -86,26 +86,18 @@ fn main() -> ExitCode {
|
|||||||
}
|
}
|
||||||
#[cfg(feature = "wgpu")]
|
#[cfg(feature = "wgpu")]
|
||||||
{
|
{
|
||||||
use eframe::egui_wgpu::{wgpu::Backends, WgpuSetup};
|
use eframe::egui_wgpu::{wgpu, WgpuSetup};
|
||||||
if graphics_config.desired_backend.is_supported() {
|
if graphics_config.desired_backend.is_supported() {
|
||||||
native_options.wgpu_options.wgpu_setup = match native_options.wgpu_options.wgpu_setup {
|
native_options.wgpu_options.wgpu_setup = match native_options.wgpu_options.wgpu_setup {
|
||||||
WgpuSetup::CreateNew {
|
WgpuSetup::CreateNew(mut setup) => {
|
||||||
supported_backends: backends,
|
setup.instance_descriptor.backends = match graphics_config.desired_backend {
|
||||||
power_preference,
|
GraphicsBackend::Auto => setup.instance_descriptor.backends,
|
||||||
device_descriptor,
|
GraphicsBackend::Dx12 => wgpu::Backends::DX12,
|
||||||
} => {
|
GraphicsBackend::Metal => wgpu::Backends::METAL,
|
||||||
let backend = match graphics_config.desired_backend {
|
GraphicsBackend::Vulkan => wgpu::Backends::VULKAN,
|
||||||
GraphicsBackend::Auto => backends,
|
GraphicsBackend::OpenGL => wgpu::Backends::GL,
|
||||||
GraphicsBackend::Dx12 => Backends::DX12,
|
|
||||||
GraphicsBackend::Metal => Backends::METAL,
|
|
||||||
GraphicsBackend::Vulkan => Backends::VULKAN,
|
|
||||||
GraphicsBackend::OpenGL => Backends::GL,
|
|
||||||
};
|
};
|
||||||
WgpuSetup::CreateNew {
|
WgpuSetup::CreateNew(setup)
|
||||||
supported_backends: backend,
|
|
||||||
power_preference,
|
|
||||||
device_descriptor,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// WgpuConfiguration::Default is CreateNew until we call run_eframe()
|
// WgpuConfiguration::Default is CreateNew until we call run_eframe()
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
|
@ -201,10 +201,7 @@ pub fn config_ui(
|
|||||||
.on_hover_text_at_pointer("Open a link to the latest release on GitHub")
|
.on_hover_text_at_pointer("Open a link to the latest release on GitHub")
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
ui.output_mut(|output| {
|
ui.ctx().open_url(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true });
|
||||||
output.open_url =
|
|
||||||
Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true })
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ pub fn demangle_window(
|
|||||||
ui.colored_label(appearance.replace_color, &demangled);
|
ui.colored_label(appearance.replace_color, &demangled);
|
||||||
});
|
});
|
||||||
if ui.button("Copy").clicked() {
|
if ui.button("Copy").clicked() {
|
||||||
ui.output_mut(|output| output.copied_text = demangled);
|
ctx.copy_text(demangled);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ui.scope(|ui| {
|
ui.scope(|ui| {
|
||||||
|
@ -734,12 +734,10 @@ fn build_log_ui(ui: &mut Ui, status: &BuildStatus, appearance: &Appearance) {
|
|||||||
ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| {
|
ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| {
|
||||||
ui.horizontal(|ui| {
|
ui.horizontal(|ui| {
|
||||||
if !status.cmdline.is_empty() && ui.button("Copy command").clicked() {
|
if !status.cmdline.is_empty() && ui.button("Copy command").clicked() {
|
||||||
ui.output_mut(|output| output.copied_text.clone_from(&status.cmdline));
|
ui.ctx().copy_text(status.cmdline.clone());
|
||||||
}
|
}
|
||||||
if ui.button("Copy log").clicked() {
|
if ui.button("Copy log").clicked() {
|
||||||
ui.output_mut(|output| {
|
ui.ctx().copy_text(format!("{}\n{}", status.stdout, status.stderr));
|
||||||
output.copied_text = format!("{}\n{}", status.stdout, status.stderr)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ui.scope(|ui| {
|
ui.scope(|ui| {
|
||||||
@ -842,7 +840,7 @@ pub fn context_menu_items_ui(
|
|||||||
write_text(")", appearance.text_color, &mut job, appearance.code_font.clone());
|
write_text(")", appearance.text_color, &mut job, appearance.code_font.clone());
|
||||||
}
|
}
|
||||||
if ui.button(job).clicked() {
|
if ui.button(job).clicked() {
|
||||||
ui.output_mut(|output| output.copied_text = value);
|
ui.ctx().copy_text(value);
|
||||||
ui.close_menu();
|
ui.close_menu();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,9 +86,10 @@ impl FrameHistory {
|
|||||||
let mut shapes = Vec::with_capacity(3 + 2 * history.len());
|
let mut shapes = Vec::with_capacity(3 + 2 * history.len());
|
||||||
shapes.push(Shape::Rect(epaint::RectShape::new(
|
shapes.push(Shape::Rect(epaint::RectShape::new(
|
||||||
rect,
|
rect,
|
||||||
style.rounding,
|
style.corner_radius,
|
||||||
ui.visuals().extreme_bg_color,
|
ui.visuals().extreme_bg_color,
|
||||||
ui.style().noninteractive().bg_stroke,
|
ui.style().noninteractive().bg_stroke,
|
||||||
|
StrokeKind::Inside,
|
||||||
)));
|
)));
|
||||||
|
|
||||||
let rect = rect.shrink(4.0);
|
let rect = rect.shrink(4.0);
|
||||||
|
@ -49,7 +49,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
|
|||||||
.on_hover_text_at_pointer(RichText::new(&err_string).color(appearance.delete_color))
|
.on_hover_text_at_pointer(RichText::new(&err_string).color(appearance.delete_color))
|
||||||
.context_menu(|ui| {
|
.context_menu(|ui| {
|
||||||
if ui.button("Copy full message").clicked() {
|
if ui.button("Copy full message").clicked() {
|
||||||
ui.output_mut(|o| o.copied_text = err_string);
|
ui.ctx().copy_text(err_string);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -61,7 +61,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
|
|||||||
.on_hover_text_at_pointer(&status.status)
|
.on_hover_text_at_pointer(&status.status)
|
||||||
.context_menu(|ui| {
|
.context_menu(|ui| {
|
||||||
if ui.button("Copy full message").clicked() {
|
if ui.button("Copy full message").clicked() {
|
||||||
ui.output_mut(|o| o.copied_text = status.status.clone());
|
ui.ctx().copy_text(status.status.clone());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ pub fn rlwinm_decode_window(
|
|||||||
ui.colored_label(appearance.replace_color, decoded.trim());
|
ui.colored_label(appearance.replace_color, decoded.trim());
|
||||||
});
|
});
|
||||||
if ui.button("Copy").clicked() {
|
if ui.button("Copy").clicked() {
|
||||||
ui.output_mut(|output| output.copied_text = decoded);
|
ctx.copy_text(decoded);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ui.scope(|ui| {
|
ui.scope(|ui| {
|
||||||
|
@ -183,7 +183,7 @@ impl DiffViewState {
|
|||||||
state: &AppStateRef,
|
state: &AppStateRef,
|
||||||
) {
|
) {
|
||||||
if let Some(result) = take(&mut self.scratch) {
|
if let Some(result) = take(&mut self.scratch) {
|
||||||
ctx.output_mut(|o| o.open_url = Some(OpenUrl::new_tab(result.scratch_url)));
|
ctx.open_url(OpenUrl::new_tab(result.scratch_url));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear the autoscroll flag so that it doesn't scroll continuously.
|
// Clear the autoscroll flag so that it doesn't scroll continuously.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user