Replace uefi dependency with std::uefi

uefi_std re-exports uefi. Adding it as a separate dependency may cause
import conflicts.

Signed-off-by: Tim Crawford <[email protected]>

Author: crawfxrd

Cargo.lock

@@ -14,7 +14,6 @@ plain = "0.2.3"
 redox_dmi = "0.1.5"
 redox_hwio = "0.1.4"
 redox_intelflash = "0.1.3"
-redox_uefi = "0.1.2"
 redox_uefi_std = "0.1.5"
 system76_ecflash = { git = "https://github.com/system76/ecflash.git" }
 system76_ectool = { git = "https://github.com/system76/ec.git", default-features = false, features = ["redox_hwio"] }

Cargo.toml

@@ -10,8 +10,8 @@ use plain::Plain;
 use std::fs::{find, load};
 use std::ptr;
 use std::vars::{get_boot_item, get_boot_order, set_boot_item, set_boot_order};
-use uefi::reset::ResetType;
-use uefi::status::{Error, Result, Status};
+use std::uefi::reset::ResetType;
+use std::uefi::status::{Error, Result, Status};
 
 use super::{FIRMWARECAP, FIRMWAREDIR, FIRMWARENSH, FIRMWAREROM, H2OFFT, IFLASHV, UEFIFLASH, shell, Component};
 

src/app/bios.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use uefi::status::Result;
+use std::uefi::status::Result;
 
 pub trait Component {
     fn name(&self) -> &str;

src/app/component.rs

@@ -18,7 +18,7 @@ use std::{
     fs::{find, load},
     str,
 };
-use uefi::status::{Error, Result};
+use std::uefi::{self, status::{Error, Result}};
 
 use super::{ECROM, EC2ROM, ECTAG, FIRMWAREDIR, FIRMWARENSH, pci_read, shell, Component};
 

src/app/ec.rs

@@ -17,9 +17,9 @@ use std::vars::{
     get_os_indications, set_os_indications,
     get_os_indications_supported
 };
-use uefi::guid;
-use uefi::reset::ResetType;
-use uefi::status::{Error, Result, Status};
+use std::uefi::guid;
+use std::uefi::reset::ResetType;
+use std::uefi::status::{Error, Result, Status};
 
 use crate::display::{Display, ScaledDisplay, Output};
 use crate::image::{self, Image};

src/app/mod.rs

@@ -4,8 +4,8 @@ use core::cell::Cell;
 use core::ops::Try;
 use orbclient::{Color, Mode, Renderer};
 use std::proto::Protocol;
-use uefi::graphics::{GraphicsOutput, GraphicsBltOp, GraphicsBltPixel};
-use uefi::guid::{Guid, GRAPHICS_OUTPUT_PROTOCOL_GUID};
+use std::uefi::graphics::{GraphicsOutput, GraphicsBltOp, GraphicsBltPixel};
+use std::uefi::guid::{Guid, GRAPHICS_OUTPUT_PROTOCOL_GUID};
 
 pub struct Output(pub &'static mut GraphicsOutput);
 

src/display.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use core::slice;
-use uefi::guid::GuidKind;
+use std::uefi::guid::GuidKind;
 
 pub fn dmi() -> Vec<dmi::Table> {
     for table in std::system_table().config_tables() {

src/dmi.rs

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use core::char;
-use uefi::status;
-use uefi::text::TextInputKey;
+use std::uefi::status;
+use std::uefi::text::TextInputKey;
 
 pub fn wait_key() -> Result<char, status::Error> {
     let uefi = std::system_table();

src/io.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use uefi::status::Result;
-use uefi::text::TextInputKey;
+use std::uefi::status::Result;
+use std::uefi::text::TextInputKey;
 
 pub fn raw_key() -> Result<TextInputKey> {
     let uefi = std::system_table();