fixed merge commit tomfoolery.

This commit is contained in:
2025-02-24 15:14:21 +00:00
parent 2f08835d69
commit e303ecf5a4
4 changed files with 2 additions and 13 deletions
-1
View File
@@ -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 {
-6
View File
@@ -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();
+2
View File
@@ -1,5 +1,7 @@
use crate::prelude::*;
mod frame;
mod render;
mod window;
pub trait Application {
-6
View File
@@ -84,9 +84,3 @@ impl Drop for Window {
}
}
}
impl Default for Window {
fn default() -> Self {
Self::new()
}
}