Merge pull request #1249 from GuillaumeGomez/backport

Backport #1248 and #1246 to 0.30

src/unix/linux/component.rs

@@ -374,16 +374,15 @@ impl ComponentsInner {
                     continue;
                 };
                 let entry = entry.path();
-                if !file_type.is_dir()
-                    || !entry
+                if !file_type.is_file()
+                    && entry
                         .file_name()
                         .and_then(|x| x.to_str())
                         .unwrap_or("")
                         .starts_with("hwmon")
                 {
-                    continue;
+                    ComponentInner::from_hwmon(&mut self.components, &entry);
                 }
-                ComponentInner::from_hwmon(&mut self.components, &entry);
             }
         }
     }

tests/components.rs

@@ -0,0 +1,17 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+#[test]
+fn test_components() {
+    use std::env::var;
+
+    let mut c = sysinfo::Components::new();
+    assert!(c.is_empty());
+
+    // Unfortunately, we can't get components in the CI...
+    if !sysinfo::IS_SUPPORTED_SYSTEM || cfg!(windows) || var("CI").is_ok() {
+        return;
+    }
+
+    c.refresh_list();
+    assert!(!c.is_empty());
+}