From cb9361939c292166d7c5770956a9942dc8f74aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Wed, 11 Sep 2024 16:13:04 +0200 Subject: [PATCH] rust: update to rustc 1.81.0 --- ci/images_template.yml | 6 +++--- src/app.rs | 3 --- src/logger.rs | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index b763fa1..ada5eb7 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_WIN_IMG_TAG: "2023-12-22.0" - GST_RS_FDO_IMG_TAG: "2024-01-05.0" - GST_RS_STABLE: "1.70.0" + GST_RS_WIN_IMG_TAG: "2024-09-11.0" + GST_RS_FDO_IMG_TAG: "2024-09-11.0" + GST_RS_STABLE: "1.81.0" diff --git a/src/app.rs b/src/app.rs index 7c3e0ba..02f0fd5 100644 --- a/src/app.rs +++ b/src/app.rs @@ -15,7 +15,6 @@ use gtk::{ PopoverMenu, ResponseType, Statusbar, Widget, }; use log::error; -use once_cell::unsync::OnceCell; use std::cell::{Cell, RefCell}; use std::collections::HashMap; use std::fs::File; @@ -40,7 +39,6 @@ pub struct GPSAppInner { pub current_graphtab: Cell, pub graphbook: RefCell>, pub builder: Builder, - pub plugin_list_initialized: OnceCell, pub signal_handlers: RefCell>, } @@ -100,7 +98,6 @@ impl GPSApp { current_graphtab: Cell::new(0), graphbook: RefCell::new(HashMap::new()), builder, - plugin_list_initialized: OnceCell::new(), signal_handlers: RefCell::new(HashMap::new()), })); let settings = Settings::load_settings(); diff --git a/src/logger.rs b/src/logger.rs index 4f43ac0..75de6f1 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -122,8 +122,7 @@ struct WriteAdapter { impl io::Write for WriteAdapter { // On write we forward each u8 of the buffer to the sender and return the length of the buffer fn write(&mut self, buf: &[u8]) -> io::Result { - self.buffer - .push_str(&String::from_utf8(buf.to_vec()).unwrap()); + self.buffer.push_str(core::str::from_utf8(buf).unwrap()); if self.buffer.ends_with('\n') { self.buffer.pop(); let _ = self.sender.try_send((LogType::App, self.buffer.clone()));