summaryrefslogtreecommitdiffstats
path: root/winit/src/system.rs
diff options
context:
space:
mode:
Diffstat (limited to 'winit/src/system.rs')
-rw-r--r--winit/src/system.rs22
1 files changed, 5 insertions, 17 deletions
diff --git a/winit/src/system.rs b/winit/src/system.rs
index beda2bdd..fa4ad1a3 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -5,20 +5,17 @@ pub use iced_native::system::*;
use iced_graphics::compositor;
/// Query for available system information.
-///
-/// Returns `None` if not using the `sysinfo` feature flag.
pub fn fetch_information<Message>(
- f: impl Fn(Option<Information>) -> Message + 'static,
+ f: impl Fn(Information) -> Message + 'static,
) -> Command<Message> {
Command::single(command::Action::System(Action::QueryInformation(
Box::new(f),
)))
}
-#[cfg(feature = "sysinfo")]
-pub(crate) fn get_information(
+pub(crate) fn information(
graphics_info: compositor::Information,
-) -> Option<Information> {
+) -> Information {
use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt};
let mut system = System::new_all();
system.refresh_all();
@@ -30,7 +27,7 @@ pub(crate) fn get_information(
.and_then(|process| Ok(process.memory()))
.ok();
- let information = Information {
+ Information {
system_name: system.name(),
system_kernel: system.kernel_version(),
system_version: system.long_os_version(),
@@ -40,14 +37,5 @@ pub(crate) fn get_information(
memory_used,
graphics_adapter: graphics_info.adapter,
graphics_backend: graphics_info.backend,
- };
-
- Some(information)
-}
-
-#[cfg(not(feature = "sysinfo"))]
-pub(crate) fn get_information(
- _graphics_info: compositor::Information,
-) -> Option<Information> {
- None
+ }
}