diff --git a/qemu-gtk4/src/console_area.rs b/qemu-gtk4/src/console_area.rs index c4da6ed..a68fd57 100644 --- a/qemu-gtk4/src/console_area.rs +++ b/qemu-gtk4/src/console_area.rs @@ -98,7 +98,7 @@ mod imp { widget.make_current(); if let Err(e) = unsafe { self.realize_gl() } { - let e = glib::Error::new(AppError::GL, &e.to_string()); + let e = glib::Error::new(AppError::GL, &e); widget.set_error(Some(&e)); } } diff --git a/qemu-gtk4/src/gstaudio.rs b/qemu-gtk4/src/gstaudio.rs index dda17c8..51252ff 100644 --- a/qemu-gtk4/src/gstaudio.rs +++ b/qemu-gtk4/src/gstaudio.rs @@ -17,12 +17,10 @@ fn pcminfo_as_caps(info: &PCMInfo) -> String { "{}{}{}", if info.is_float { "F" + } else if info.is_signed { + "S" } else { - if info.is_signed { - "S" - } else { - "U" - } + "U" }, info.bits, if info.be { "BE" } else { "LE" } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 50ad9cf..4b12c8b 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -15,7 +15,7 @@ fn main() { fn try_main() -> Result<(), DynError> { let task = env::args().nth(1); - match task.as_ref().map(|it| it.as_str()) { + match task.as_deref() { Some("codegen") => codegen()?, _ => print_help(), }