Merge pull request #1262 from GuillaumeGomez/global-cpu-name

Always make global CPU name empty

.github/workflows/CI.yml

@@ -75,7 +75,6 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
 
       - name: Install cross-target
-        if: matrix.triple.cross
         run: rustup target add ${{ matrix.triple.target }}
 
       - name: Check

src/lib.rs

@@ -493,6 +493,15 @@ mod test {
         }
     }
 
+    // Ensure that the global CPU name is always empty.
+    #[test]
+    fn check_global_cpu_name() {
+        let mut s = System::new();
+        assert_eq!(s.global_cpu_info().name(), "");
+        s.refresh_cpu_all();
+        assert_eq!(s.global_cpu_info().name(), "");
+    }
+
     // In case `Process::updated` is misused, `System::refresh_processes` might remove them
     // so this test ensures that it doesn't happen.
     #[test]

src/unix/apple/cpu.rs

@@ -22,7 +22,7 @@ impl CpusWrapper {
         Self {
             global_cpu: Cpu {
                 inner: CpuInner::new(
-                    "0".to_owned(),
+                    String::new(),
                     Arc::new(CpuData::new(std::ptr::null_mut(), 0)),
                     0,
                     String::new(),

src/unix/linux/cpu.rs

@@ -102,13 +102,7 @@ impl CpusWrapper {
                     if &line[..4] != b"cpu " {
                         return;
                     }
-                    let mut parts = line.split(|x| *x == b' ').filter(|s| !s.is_empty());
-                    if first {
-                        to_str!(parts.next().unwrap_or(&[]))
-                            .clone_into(&mut self.global_cpu.inner.name);
-                    } else {
-                        parts.next();
-                    }
+                    let mut parts = line.split(|x| *x == b' ').filter(|s| !s.is_empty()).skip(1);
                     self.global_cpu.inner.set(
                         parts.next().map(to_u64).unwrap_or(0),
                         parts.next().map(to_u64).unwrap_or(0),

src/windows/cpu.rs

@@ -255,12 +255,7 @@ impl CpusWrapper {
     pub fn new() -> Self {
         Self {
             global: Cpu {
-                inner: CpuInner::new_with_values(
-                    "Total CPU".to_owned(),
-                    String::new(),
-                    String::new(),
-                    0,
-                ),
+                inner: CpuInner::new_with_values(String::new(), String::new(), String::new(), 0),
             },
             cpus: Vec::new(),
             got_cpu_frequency: false,