From e303ecf5a4ddd92d0495af6fdfee12724072b767 Mon Sep 17 00:00:00 2001
From: zxq5 <zxq5@zxq5.dev>
Date: Mon, 24 Feb 2025 15:14:21 +0000
Subject: [PATCH] fixed merge commit tomfoolery.

---
 libk/src/drivers/io/keyboard.rs     | 1 -
 libk/src/drivers/scheduling/task.rs | 6 ------
 libk/src/std/application.rs         | 2 ++
 libk/src/std/application/window.rs  | 6 ------
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/libk/src/drivers/io/keyboard.rs b/libk/src/drivers/io/keyboard.rs
index 6851123..0d7738e 100644
--- a/libk/src/drivers/io/keyboard.rs
+++ b/libk/src/drivers/io/keyboard.rs
@@ -17,7 +17,6 @@ static WAKER: AtomicWaker = AtomicWaker::new();
 
 pub fn add_scancode(scancode: u8) {
     if let Some(queue) = KBD_QUEUE.get() {
-        if queue.push(scancode).is_err() {
         if queue.push(scancode).is_err() {
             println!("WARNING: scancode queue full; dropping keyboard input");
         } else {
diff --git a/libk/src/drivers/scheduling/task.rs b/libk/src/drivers/scheduling/task.rs
index 503c107..cb84b1e 100644
--- a/libk/src/drivers/scheduling/task.rs
+++ b/libk/src/drivers/scheduling/task.rs
@@ -127,12 +127,6 @@ impl TaskWaker {
     }
 }
 
-impl Default for Executor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl Wake for TaskWaker {
     fn wake(self: Arc<Self>) {
         self.wake_task();
diff --git a/libk/src/std/application.rs b/libk/src/std/application.rs
index 5dec265..44c2651 100644
--- a/libk/src/std/application.rs
+++ b/libk/src/std/application.rs
@@ -1,5 +1,7 @@
 use crate::prelude::*;
 
+mod frame;
+mod render;
 mod window;
 
 pub trait Application {
diff --git a/libk/src/std/application/window.rs b/libk/src/std/application/window.rs
index e84ce01..b270508 100644
--- a/libk/src/std/application/window.rs
+++ b/libk/src/std/application/window.rs
@@ -84,9 +84,3 @@ impl Drop for Window {
         }
     }
 }
-
-impl Default for Window {
-    fn default() -> Self {
-        Self::new()
-    }
-}