rafaelcaricio/lvgl-rs
1
0
Fork 0
Code Issues 12 Pull requests 2 Projects Releases 4 Wiki Activity

Format code

Browse source
This commit is contained in:
Rafael Caricio 2021-03-07 18:28:19 +01:00 committed by Rafael Carício
parent f60d8d999b
commit d699101afe
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lvgl-codegen/src/lib.rs
View file

@ -1,8 +1,8 @@
use inflector::cases::pascalcase::to_pascal_case; use inflector::cases::pascalcase::to_pascal_case;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use proc_macro2::{Ident, TokenStream}; use proc_macro2::{Ident, TokenStream};
use quote::{format_ident, ToTokens};
use quote::quote; use quote::quote;
use quote::{format_ident, ToTokens};
use regex::Regex; use regex::Regex;
use std::collections::HashMap; use std::collections::HashMap;
use std::error::Error; use std::error::Error;

28
lvgl-sys/build.rs
View file

@ -12,7 +12,9 @@ fn main() {
let vendor_src = vendor.join("lvgl").join("src"); let vendor_src = vendor.join("lvgl").join("src");
let lv_config_dir = { 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") { match std::env::var("DOCS_RS") {
Ok(_) => { Ok(_) => {
// We've detected that we are building for docs.rs // We've detected that we are building for docs.rs
@ -22,9 +24,9 @@ fn main() {
Err(_) => panic!( Err(_) => panic!(
"The environment variable {} is required to be defined", "The environment variable {} is required to be defined",
CONFIG_NAME CONFIG_NAME
) ),
} }
}); });
if !conf_path.exists() { if !conf_path.exists() {
panic!(format!( panic!(format!(
@ -91,11 +93,20 @@ fn main() {
if target.ends_with("emscripten") { if target.ends_with("emscripten") {
if let Ok(em_path) = env::var("EMSDK") { if let Ok(em_path) = env::var("EMSDK") {
additional_args.push("-I".to_string()); 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("-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("-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() .generate()
.expect("Unable to generate bindings"); .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!"); .expect("Can't write bindings!");
} }

13
lvgl/src/support.rs
View file

@ -29,21 +29,15 @@ impl Color {
} }
pub fn r(&self) -> u8 { pub fn r(&self) -> u8 {
unsafe { unsafe { lvgl_sys::_LV_COLOR_GET_R(self.raw) as u8 }
lvgl_sys::_LV_COLOR_GET_R(self.raw) as u8
}
} }
pub fn g(&self) -> u8 { pub fn g(&self) -> u8 {
unsafe { unsafe { lvgl_sys::_LV_COLOR_GET_G(self.raw) as u8 }
lvgl_sys::_LV_COLOR_GET_G(self.raw) as u8
}
} }
pub fn b(&self) -> u8 { pub fn b(&self) -> u8 {
unsafe { unsafe { lvgl_sys::_LV_COLOR_GET_B(self.raw) as u8 }
lvgl_sys::_LV_COLOR_GET_B(self.raw) as u8
}
} }
} }
@ -250,7 +244,6 @@ impl From<Animation> for lvgl_sys::lv_anim_enable_t {
} }
} }
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;