Update deps

Cargo.toml

@@ -8,15 +8,10 @@ license = "GPL-3.0-only"
 lto = true
 
 [dependencies]
-memoffset = "0.9"
 orbclient = { version = "0.3.46", default-features = false }
 orbfont = { version = "0.1.12", default-features = false, features = ["no-std"] }
-redox_uefi_std = "0.1.13"
-
-[dependencies.system76_ectool]
-git = "https://github.com/system76/ec.git"
-default-features = false
-features = ["redox_hwio"]
+redox_uefi_std = "0.1.14"
+system76_ectool = { git = "https://github.com/system76/ec.git", default-features = false, features = ["redox_hwio"] }
 
 [features]
 default = []

src/display.rs

@@ -5,13 +5,12 @@ use orbclient::{Color, Mode, Renderer};
 use std::prelude::*;
 use std::proto::Protocol;
 use std::uefi::graphics::{GraphicsBltOp, GraphicsBltPixel, GraphicsOutput};
-use std::uefi::guid::GRAPHICS_OUTPUT_PROTOCOL_GUID;
 
 pub struct Output(pub &'static mut GraphicsOutput);
 
 impl Protocol<GraphicsOutput> for Output {
     fn guid() -> Guid {
-        GRAPHICS_OUTPUT_PROTOCOL_GUID
+        GraphicsOutput::GUID
     }
 
     fn new(inner: &'static mut GraphicsOutput) -> Self {

src/fde.rs

@@ -140,11 +140,11 @@ macro_rules! list_entry {
     ($t:ident, $l:tt) => {
         impl ListEntryObject<$t> for ListEntry<$t> {
             unsafe fn object(&self) -> &$t {
-                unsafe { self.object_at(offset_of!($t, $l)) }
+                unsafe { self.object_at(mem::offset_of!($t, $l)) }
             }
 
             unsafe fn object_mut(&mut self) -> &mut $t {
-                unsafe { self.object_at_mut(offset_of!($t, $l)) }
+                unsafe { self.object_at_mut(mem::offset_of!($t, $l)) }
             }
         }
     };
@@ -402,7 +402,7 @@ fn form_display_inner(form: &Form, user_input: &mut UserInput) -> Result<()> {
     'render: loop {
         let mut hotkey_helps = Vec::new();
         for hotkey in form.HotKeyListHead.iter() {
-            let hotkey_help = ffi::nstr(hotkey.HelpString);
+            let hotkey_help = unsafe { ffi::nstr(hotkey.HelpString) };
             hotkey_helps.push(hotkey_help);
         }
 

src/hii.rs

@@ -2,15 +2,14 @@
 
 use std::prelude::*;
 use std::proto::Protocol;
-use std::uefi::guid::HII_DATABASE_GUID;
 use std::uefi::hii::database::HiiDatabase;
 
 #[allow(dead_code)]
 pub struct Database(pub &'static mut HiiDatabase);
 
 impl Protocol<HiiDatabase> for Database {
     fn guid() -> Guid {
-        HII_DATABASE_GUID
+        HiiDatabase::GUID
     }
 
     fn new(inner: &'static mut HiiDatabase) -> Self {

src/main.rs

@@ -4,8 +4,6 @@
 #![no_main]
 #![allow(non_snake_case)]
 
-#[macro_use]
-extern crate memoffset;
 #[macro_use]
 extern crate uefi_std as std;