diff options
author | 2024-05-23 13:38:22 +0200 | |
---|---|---|
committer | 2024-05-23 13:38:22 +0200 | |
commit | 663a081bdd507da0b5ca7d4dc30d78a20b4618af (patch) | |
tree | 89482c8d1e3a03e00b3a8151abbb81e30ae5898c /examples/system_information/src | |
parent | 468794d918eb06c1dbebb33c32b10017ad335f05 (diff) | |
parent | d8ba6b0673a33724a177f3a1ba59705527280142 (diff) | |
download | iced-663a081bdd507da0b5ca7d4dc30d78a20b4618af.tar.gz iced-663a081bdd507da0b5ca7d4dc30d78a20b4618af.tar.bz2 iced-663a081bdd507da0b5ca7d4dc30d78a20b4618af.zip |
Merge pull request #2338 from derezzedex/feat/text-macro
Introduce `text` macro
Diffstat (limited to 'examples/system_information/src')
-rw-r--r-- | examples/system_information/src/main.rs | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/examples/system_information/src/main.rs b/examples/system_information/src/main.rs index 66bc4979..8ce12e1c 100644 --- a/examples/system_information/src/main.rs +++ b/examples/system_information/src/main.rs @@ -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,13 @@ 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!( - "Graphics adapter: {}", - information.graphics_adapter - )); + let graphics_adapter = + text!("Graphics adapter: {}", information.graphics_adapter); - let graphics_backend = text(format!( - "Graphics backend: {}", - information.graphics_backend - )); + let graphics_backend = + text!("Graphics backend: {}", information.graphics_backend); column![ system_name.size(30), |