diff options
| -rw-r--r-- | native/src/system/information.rs | 24 | ||||
| -rw-r--r-- | winit/src/application.rs | 19 |
2 files changed, 21 insertions, 22 deletions
diff --git a/native/src/system/information.rs b/native/src/system/information.rs index 2100d110..a2abec93 100644 --- a/native/src/system/information.rs +++ b/native/src/system/information.rs @@ -1,12 +1,20 @@ /// Contains informations about the system (e.g. system name, processor, memory, graphics adapter). #[derive(Debug)] pub struct Information { - system_name: String, - system_kernel: String, - system_version: String, - cpu_brand: String, - cpu_vendor: String, - cpu_name: String, - cpu_cores: String, - memory_total: String, + /// Contains the system name. + pub system_name: Option<String>, + /// Contains the kernel version. + pub system_kernel: Option<String>, + /// Contains the systme version. + pub system_version: Option<String>, + /// Contains the processor brand. + pub cpu_brand: String, + /// Contains the processor vendor id. + pub cpu_vendor: String, + /// Contains the processor name. + pub cpu_name: String, + /// Contains the number of physical cores on the processor. + pub cpu_cores: Option<usize>, + /// Contains the total RAM size in KB. + pub memory_total: u64, } diff --git a/winit/src/application.rs b/winit/src/application.rs index d184c0c3..b2f9be29 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -583,25 +583,16 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>( system.refresh_all(); let cpu = system.global_processor_info(); - let unknown = String::from("unknown"); let information = system::Information { - system_name: system - .name() - .unwrap_or(unknown.clone()), - system_kernel: system - .kernel_version() - .unwrap_or(unknown.clone()), - system_version: system - .long_os_version() - .unwrap_or(unknown.clone()), + system_name: system.name(), + system_kernel: system.kernel_version(), + system_version: system.long_os_version(), cpu_brand: cpu.brand().into(), cpu_vendor: cpu.vendor_id().into(), cpu_name: cpu.name().into(), - cpu_cores: system - .physical_core_count() - .map_or(unknown, |cores| cores.to_string()), - memory_total: system.total_memory().to_string(), + cpu_cores: system.physical_core_count(), + memory_total: system.total_memory(), }; Some(information) |