fixed merge commit tomfoolery.
This commit is contained in:
@@ -17,7 +17,6 @@ static WAKER: AtomicWaker = AtomicWaker::new();
|
|||||||
|
|
||||||
pub fn add_scancode(scancode: u8) {
|
pub fn add_scancode(scancode: u8) {
|
||||||
if let Some(queue) = KBD_QUEUE.get() {
|
if let Some(queue) = KBD_QUEUE.get() {
|
||||||
if queue.push(scancode).is_err() {
|
|
||||||
if queue.push(scancode).is_err() {
|
if queue.push(scancode).is_err() {
|
||||||
println!("WARNING: scancode queue full; dropping keyboard input");
|
println!("WARNING: scancode queue full; dropping keyboard input");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -127,12 +127,6 @@ impl TaskWaker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Executor {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::new()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Wake for TaskWaker {
|
impl Wake for TaskWaker {
|
||||||
fn wake(self: Arc<Self>) {
|
fn wake(self: Arc<Self>) {
|
||||||
self.wake_task();
|
self.wake_task();
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
|
mod frame;
|
||||||
|
mod render;
|
||||||
mod window;
|
mod window;
|
||||||
|
|
||||||
pub trait Application {
|
pub trait Application {
|
||||||
|
|||||||
@@ -84,9 +84,3 @@ impl Drop for Window {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Window {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::new()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user