Remove std feature

There's no need for it, the only no_std environment is UEFI and it's
unlikely there'll be another one.
Maybe we could rename uefi to no_std in the future, but right now it
makes no sense to duplicate it.

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/Cargo.toml

@@ -8,8 +8,7 @@ rust-version = "1.74"
 build = "build.rs"
 
 [features]
-default = ["std"]
-std = ["hidapi", "rusb"]
+default = ["hidapi", "rusb"]
 rusb = ["dep:rusb"]
 hidapi = ["dep:hidapi"]
 uefi = [ "lazy_static/spin_no_std" ]

framework_lib/src/capsule.rs

@@ -11,9 +11,9 @@
 use std::prelude::v1::*;
 
 use core::prelude::rust_2021::derive;
-#[cfg(all(not(feature = "uefi"), feature = "std"))]
+#[cfg(not(feature = "uefi"))]
 use std::fs::File;
-#[cfg(all(not(feature = "uefi"), feature = "std"))]
+#[cfg(not(feature = "uefi"))]
 use std::io::prelude::*;
 
 #[cfg(not(feature = "uefi"))]
@@ -180,7 +180,7 @@ pub fn dump_winux_image(data: &[u8], header: &DisplayCapsule, filename: &str) {
 
     let image = &data[header_len..image_size];
 
-    #[cfg(all(not(feature = "uefi"), feature = "std"))]
+    #[cfg(not(feature = "uefi"))]
     {
         let mut file = File::create(filename).unwrap();
         file.write_all(image).unwrap();

framework_lib/src/commandline/mod.rs

@@ -17,7 +17,7 @@ pub mod uefi;
 
 #[cfg(not(feature = "uefi"))]
 use std::fs;
-#[cfg(all(not(feature = "uefi"), feature = "std"))]
+#[cfg(not(feature = "uefi"))]
 use std::io::prelude::*;
 
 #[cfg(feature = "rusb")]
@@ -553,7 +553,7 @@ fn flash_ec(ec: &CrosEc, ec_bin_path: &str, flash_type: EcFlashType) {
 fn dump_ec_flash(ec: &CrosEc, dump_path: &str) {
     let flash_bin = ec.get_entire_ec_flash().unwrap();
 
-    #[cfg(all(not(feature = "uefi"), feature = "std"))]
+    #[cfg(not(feature = "uefi"))]
     {
         let mut file = fs::File::create(dump_path).unwrap();
         file.write_all(&flash_bin).unwrap();

framework_lib/src/util.rs

@@ -6,11 +6,11 @@ use std::prelude::v1::*;
 #[cfg(feature = "uefi")]
 use core::prelude::rust_2021::derive;
 
-#[cfg(not(feature = "std"))]
+#[cfg(feature = "uefi")]
 use alloc::sync::Arc;
-#[cfg(not(feature = "std"))]
+#[cfg(feature = "uefi")]
 use spin::{Mutex, MutexGuard};
-#[cfg(feature = "std")]
+#[cfg(not(feature = "uefi"))]
 use std::sync::{Arc, Mutex, MutexGuard};
 
 use crate::smbios;
@@ -74,9 +74,9 @@ pub struct Config {
 
 impl Config {
     pub fn set(platform: Platform) {
-        #[cfg(feature = "std")]
+        #[cfg(not(feature = "uefi"))]
         let mut config = CONFIG.lock().unwrap();
-        #[cfg(not(feature = "std"))]
+        #[cfg(feature = "uefi")]
         let mut config = CONFIG.lock();
 
         if (*config).is_none() {
@@ -87,9 +87,9 @@ impl Config {
         }
     }
     pub fn is_set() -> bool {
-        #[cfg(feature = "std")]
+        #[cfg(not(feature = "uefi"))]
         let config = CONFIG.lock().unwrap();
-        #[cfg(not(feature = "std"))]
+        #[cfg(feature = "uefi")]
         let config = CONFIG.lock();
 
         (*config).is_some()
@@ -98,9 +98,9 @@ impl Config {
     pub fn get() -> MutexGuard<'static, Option<Self>> {
         trace!("Config::get() entry");
         let unset = {
-            #[cfg(feature = "std")]
+            #[cfg(not(feature = "uefi"))]
             let config = CONFIG.lock().unwrap();
-            #[cfg(not(feature = "std"))]
+            #[cfg(feature = "uefi")]
             let config = CONFIG.lock();
             (*config).is_none()
         };
@@ -115,9 +115,9 @@ impl Config {
             None
         };
 
-        #[cfg(feature = "std")]
+        #[cfg(not(feature = "uefi"))]
         let mut config = CONFIG.lock().unwrap();
-        #[cfg(not(feature = "std"))]
+        #[cfg(feature = "uefi")]
         let mut config = CONFIG.lock();
 
         if new_config.is_some() {