me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: replace text(format!( with text macro

Browse source
This commit is contained in:
Richard Custodio 2024-03-18 17:08:56 -03:00
parent 6146382676
commit bf9bbf4a3e
No known key found for this signature in database
GPG key ID: 95F51F46E2C6E8D7
18 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

36
examples/system_information/src/main.rs
View file

@ -45,56 +45,56 @@ impl Example {
let content: Element<_> = match self {
Example::Loading => text("Loading...").size(40).into(),
Example::Loaded { information } => {
let system_name = text(format!(
let system_name = text!(
"System name: {}",
information
.system_name
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_kernel = text(format!(
let system_kernel = text!(
"System kernel: {}",
information
.system_kernel
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_version = text(format!(
let system_version = text!(
"System version: {}",
information
.system_version
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let system_short_version = text(format!(
let system_short_version = text!(
"System short version: {}",
information
.system_short_version
.as_ref()
.unwrap_or(&"unknown".to_string())
));
);
let cpu_brand =
text(format!("Processor brand: {}", information.cpu_brand));
text!("Processor brand: {}", information.cpu_brand);
let cpu_cores = text(format!(
let cpu_cores = text!(
"Processor cores: {}",
information
.cpu_cores
.map_or("unknown".to_string(), |cores| cores
.to_string())
));
);
let memory_readable =
ByteSize::b(information.memory_total).to_string();
let memory_total = text(format!(
let memory_total = text!(
"Memory (total): {} bytes ({memory_readable})",
information.memory_total,
));
);
let memory_text = if let Some(memory_used) =
information.memory_used
@ -106,17 +106,17 @@ impl Example {
String::from("None")
};
let memory_used = text(format!("Memory (used): {memory_text}"));
let memory_used = text!("Memory (used): {memory_text}");
let graphics_adapter = text(format!(
let graphics_adapter = text!(
"Graphics adapter: {}",
information.graphics_adapter
));
);
let graphics_backend = text(format!(
let graphics_backend = text!(
"Graphics backend: {}",
information.graphics_backend
));
);
column![
system_name.size(30),