]> git.lizzy.rs Git - loadnothing.git/commitdiff
Less operators
authorHimbeerserverDE <himbeerserverde@gmail.com>
Tue, 20 Sep 2022 15:18:06 +0000 (17:18 +0200)
committerHimbeerserverDE <himbeerserverde@gmail.com>
Tue, 20 Sep 2022 15:18:06 +0000 (17:18 +0200)
stage2/src/vga.rs

index fa4a49996aa47ce4bd05cf7f5267c89e0cc84bad..efa492e1ffd44005a0ff96897631a8d427daedb1 100644 (file)
@@ -1,4 +1,4 @@
-use core::ops::{AddAssign, Deref, DerefMut, Shl, Sub};
+use core::ops::{AddAssign, BitOr, Deref, DerefMut, Shl, Sub};
 
 use lazy_static::lazy_static;
 use spin::Mutex;
@@ -32,7 +32,7 @@ pub struct ColorCode(u8);
 
 impl ColorCode {
     pub fn new(foreground: Color, background: Color) -> ColorCode {
-        ColorCode((background as u8).shl(4) | (foreground as u8))
+        ColorCode(((background as u8).shl(4) as u8).bitor(foreground as u8))
     }
 }