From 294b84b4901939df99fb368ac4f326465bb2bd94 Mon Sep 17 00:00:00 2001 From: Rafael Caricio Date: Sun, 7 Mar 2021 18:25:05 +0100 Subject: [PATCH 1/2] Upgrade LVGL vendored to v7.10.1 --- lvgl-codegen/Cargo.toml | 8 ++++---- lvgl-sys/Cargo.toml | 4 ++-- lvgl-sys/vendor/lvgl | 2 +- lvgl/Cargo.toml | 6 +++--- lvgl/src/ui.rs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lvgl-codegen/Cargo.toml b/lvgl-codegen/Cargo.toml index d36b716..de9ecfe 100644 --- a/lvgl-codegen/Cargo.toml +++ b/lvgl-codegen/Cargo.toml @@ -9,10 +9,10 @@ license = "MIT" repository = "https://github.com/rafaelcaricio/lvgl-rs" [dependencies] -regex = "1.3.9" -quote = "1.0.7" +regex = "1.4.3" +quote = "1.0.9" lazy_static = "1.4.0" -proc-macro2 = "1.0.18" +proc-macro2 = "1.0.24" Inflector = "0.11.4" -syn = { version = "1.0.31", features = ["full"]} +syn = { version = "1.0.62", features = ["full"]} diff --git a/lvgl-sys/Cargo.toml b/lvgl-sys/Cargo.toml index 0bb6ddc..cc7b74f 100644 --- a/lvgl-sys/Cargo.toml +++ b/lvgl-sys/Cargo.toml @@ -20,5 +20,5 @@ name = "lvgl_sys" cty = "0.2.1" [build-dependencies] -cc = "1.0.50" -bindgen = "0.54.0" +cc = "1.0.67" +bindgen = "0.57.0" diff --git a/lvgl-sys/vendor/lvgl b/lvgl-sys/vendor/lvgl index 1ca1934..5247094 160000 --- a/lvgl-sys/vendor/lvgl +++ b/lvgl-sys/vendor/lvgl @@ -1 +1 @@ -Subproject commit 1ca1934dbe8e826ef1ed1690005fb678fea3a1f3 +Subproject commit 524709472757405ac0eef8d6d002632526430df3 diff --git a/lvgl/Cargo.toml b/lvgl/Cargo.toml index 7847012..e460295 100644 --- a/lvgl/Cargo.toml +++ b/lvgl/Cargo.toml @@ -15,12 +15,12 @@ build = "build.rs" lvgl-sys = { version = "0.5.2", path = "../lvgl-sys" } cty = "0.2.1" embedded-graphics = "0.6.2" -cstr_core = "0.2.0" +cstr_core = "0.2.3" bitflags = "1.2.1" [build-dependencies] -quote = "1.0.7" -proc-macro2 = "1.0.18" +quote = "1.0.9" +proc-macro2 = "1.0.24" lvgl-codegen = { version = "0.5.2", path = "../lvgl-codegen" } lvgl-sys = { version = "0.5.2", path = "../lvgl-sys" } diff --git a/lvgl/src/ui.rs b/lvgl/src/ui.rs index 686103b..699741c 100644 --- a/lvgl/src/ui.rs +++ b/lvgl/src/ui.rs @@ -43,7 +43,7 @@ where C: PixelColor + From, { pub fn init() -> LvResult { - if !LVGL_IN_USE.compare_exchange(false, true, Ordering::SeqCst, Ordering::Relaxed) { + if !LVGL_IN_USE.compare_and_swap(false, true, Ordering::SeqCst) { unsafe { lvgl_sys::lv_init(); } -- 2.34.1 From c5243c67b616be419e3f1aec135bd1f44dd8fafd Mon Sep 17 00:00:00 2001 From: Rafael Caricio Date: Sun, 7 Mar 2021 18:28:19 +0100 Subject: [PATCH 2/2] Format code --- lvgl-codegen/src/lib.rs | 2 +- lvgl-sys/build.rs | 28 ++++++++++++++++++++-------- lvgl/src/support.rs | 13 +++---------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/lvgl-codegen/src/lib.rs b/lvgl-codegen/src/lib.rs index eaf83bd..9fb182f 100644 --- a/lvgl-codegen/src/lib.rs +++ b/lvgl-codegen/src/lib.rs @@ -1,8 +1,8 @@ use inflector::cases::pascalcase::to_pascal_case; use lazy_static::lazy_static; use proc_macro2::{Ident, TokenStream}; -use quote::{format_ident, ToTokens}; use quote::quote; +use quote::{format_ident, ToTokens}; use regex::Regex; use std::collections::HashMap; use std::error::Error; diff --git a/lvgl-sys/build.rs b/lvgl-sys/build.rs index 4f67239..28f158f 100644 --- a/lvgl-sys/build.rs +++ b/lvgl-sys/build.rs @@ -12,7 +12,9 @@ fn main() { let vendor_src = vendor.join("lvgl").join("src"); let lv_config_dir = { - let conf_path = env::var(CONFIG_NAME).map(|raw_path| PathBuf::from(raw_path)).unwrap_or_else(|_| { + let conf_path = env::var(CONFIG_NAME) + .map(|raw_path| PathBuf::from(raw_path)) + .unwrap_or_else(|_| { match std::env::var("DOCS_RS") { Ok(_) => { // We've detected that we are building for docs.rs @@ -22,9 +24,9 @@ fn main() { Err(_) => panic!( "The environment variable {} is required to be defined", CONFIG_NAME - ) - } - }); + ), + } + }); if !conf_path.exists() { panic!(format!( @@ -91,11 +93,20 @@ fn main() { if target.ends_with("emscripten") { if let Ok(em_path) = env::var("EMSDK") { additional_args.push("-I".to_string()); - additional_args.push(format!("{}/upstream/emscripten/system/include/libc", em_path)); + additional_args.push(format!( + "{}/upstream/emscripten/system/include/libc", + em_path + )); additional_args.push("-I".to_string()); - additional_args.push(format!("{}/upstream/emscripten/system/lib/libc/musl/arch/emscripten", em_path)); + additional_args.push(format!( + "{}/upstream/emscripten/system/lib/libc/musl/arch/emscripten", + em_path + )); additional_args.push("-I".to_string()); - additional_args.push(format!("{}/upstream/emscripten/system/include/SDL", em_path)); + additional_args.push(format!( + "{}/upstream/emscripten/system/include/SDL", + em_path + )); } } @@ -112,7 +123,8 @@ fn main() { .generate() .expect("Unable to generate bindings"); - bindings.write_to_file(out_path.join("bindings.rs")) + bindings + .write_to_file(out_path.join("bindings.rs")) .expect("Can't write bindings!"); } diff --git a/lvgl/src/support.rs b/lvgl/src/support.rs index 9ab3cbd..1d529a7 100644 --- a/lvgl/src/support.rs +++ b/lvgl/src/support.rs @@ -29,21 +29,15 @@ impl Color { } pub fn r(&self) -> u8 { - unsafe { - lvgl_sys::_LV_COLOR_GET_R(self.raw) as u8 - } + unsafe { lvgl_sys::_LV_COLOR_GET_R(self.raw) as u8 } } pub fn g(&self) -> u8 { - unsafe { - lvgl_sys::_LV_COLOR_GET_G(self.raw) as u8 - } + unsafe { lvgl_sys::_LV_COLOR_GET_G(self.raw) as u8 } } pub fn b(&self) -> u8 { - unsafe { - lvgl_sys::_LV_COLOR_GET_B(self.raw) as u8 - } + unsafe { lvgl_sys::_LV_COLOR_GET_B(self.raw) as u8 } } } @@ -250,7 +244,6 @@ impl From for lvgl_sys::lv_anim_enable_t { } } - #[cfg(test)] mod test { use super::*; -- 2.34.1