Fix build issues

neri · Nov 15, 2023 · 8b48911 · 8b48911
1 parent 5559181
commit 8b48911
Show file tree

Hide file tree

Showing 28 changed files with 367 additions and 235 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # MEG-OS
 
-***NOTE: IT IS CURRENTLY NOT POSSIBLE TO BUILD WITH THE LATEST NIGHTLY VERSION.***
-
 ![GitHub](https://img.shields.io/github/license/neri/maystorm) ![GitHub top language](https://img.shields.io/github/languages/top/neri/maystorm)
 
 A hobby operating system written in Rust that supports WebAssembly.

diff --git a/apps/Cargo.lock b/apps/Cargo.lock
diff --git a/boot/Cargo.lock b/boot/Cargo.lock
diff --git a/boot/boot-efi/src/main.rs b/boot/boot-efi/src/main.rs
@@ -11,14 +11,16 @@ use uefi::{
  prelude::*,
  proto::console::gop,
  table::{
- boot::{OpenProtocolAttributes, OpenProtocolParams, SearchType},
+ boot::{MemoryType, OpenProtocolAttributes, OpenProtocolParams, SearchType},
  cfg::{ACPI2_GUID, SMBIOS_GUID},
  },
  Identify,
 };
 
 //#define EFI_DTB_TABLE_GUID {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}}
-const DTB_GUID: Guid = Guid::from_values(0xb1b621d5, 0xf19c, 0x41a5, 0x830b, 0xd9152c69aae0);
+const DTB_GUID: Guid = Guid::from_bytes([
+ 0xb1, 0xb6, 0x21, 0xd5, 0xf1, 0x9c, 0x41, 0xa5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0,
+]);
 
 static KERNEL_PATH: &str = "/EFI/MEGOS/kernel.bin";
 static INITRD_PATH: &str = "/EFI/MEGOS/initrd.img";
@@ -154,7 +156,7 @@ fn efi_main(handle: Handle, mut st: SystemTable<Boot>) -> Status {
  // Exit Boot Services
  //
 
- let (_st, mm) = st.exit_boot_services();
+ let (_st, mm) = st.exit_boot_services(MemoryType::LOADER_DATA);
 
  // ------------------------------------------------------------------------
 

diff --git a/lib/meggl/src/bitmap.rs b/lib/meggl/src/bitmap.rs
@@ -27,7 +27,9 @@ pub trait DrawRect: SetPixel {
  }
 
  fn draw_rect(&mut self, rect: Rect, color: Self::ColorType) {
- let Ok(coords) = Coordinates::from_rect(rect) else { return };
+ let Ok(coords) = Coordinates::from_rect(rect) else {
+ return;
+ };
  let width = rect.width();
  let height = rect.height();
  self.draw_hline(coords.left_top(), width, color);
@@ -190,7 +192,9 @@ pub trait DrawGlyph: SetPixel {
  fn draw_glyph(&mut self, glyph: &[u8], size: Size, origin: Point, color: Self::ColorType) {
  let stride = (size.width as usize + 7) / 8;
 
- let Ok(mut coords) = Coordinates::from_rect(Rect::from((origin, size))) else { return };
+ let Ok(mut coords) = Coordinates::from_rect(Rect::from((origin, size))) else {
+ return;
+ };
 
  let width = self.width() as isize;
  let height = self.height() as isize;
@@ -250,7 +254,9 @@ pub trait DrawGlyph: SetPixel {
  origin.x,
  size.height,
  size.width,
- )) else { return };
+ )) else {
+ return;
+ };
 
  if coords.right > width {
  coords.right = width;
@@ -265,7 +271,7 @@ pub trait DrawGlyph: SetPixel {
  let new_rect = Rect::from(coords);
  let width = new_rect.height() as usize;
  let height = new_rect.width();
- drop(new_rect);
+
  let w8 = width / 8;
  let w7 = width & 7;
  let mut cursor = 0;

diff --git a/lib/megstd/src/fs.rs b/lib/megstd/src/fs.rs
@@ -66,7 +66,7 @@ impl Write for File {
  }
 }
 
-#[derive(Clone)]
+// #[derive(Clone)]
 pub struct OpenOptions(fs_imp::OpenOptions);
 
 impl OpenOptions {

diff --git a/lib/megstd/src/lib.rs b/lib/megstd/src/lib.rs
@@ -20,13 +20,15 @@ pub mod time;
 pub mod uuid;
 
 #[cfg(feature = "window")]
+#[allow(unused_imports)]
 pub mod window {
  pub use crate::sys::window::*;
 }
 
 extern crate alloc;
 
 pub use prelude::*;
+#[allow(unused_imports)]
 mod prelude {
  pub use crate::{osstr::*, sys::prelude::*};
  pub use alloc::{