Skip to content

Commit

Permalink
Revert dep updates to start fixing each one by one
Browse files Browse the repository at this point in the history
  • Loading branch information
zanderlewis committed Jan 27, 2025
1 parent 6caae9d commit 8b5b6e2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
12 changes: 8 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
ignore:
- dependency-name: "vte"
- dependency-name: "bootloader"
- dependency-name: "time"
7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ acpi = "5.0.0"
aml = "0.16.4"
base64 = { version = "0.22.1", default-features = false, features = ["alloc"] }
bit_field = "0.10.2"
bootloader = { version = "0.11.9", features = ["map_physical_memory"] }
bootloader = { version = "0.9.29", features = ["map_physical_memory"] }
lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
libm = "0.2.11"
linked_list_allocator = "0.10.5"
Expand All @@ -32,17 +32,16 @@ object = { version = "0.36.7", default-features = false, features = ["read"] }
pbkdf2 = { version = "0.12.2", default-features = false, features = ["hmac"] }
pc-keyboard = "0.8.0"
pic8259 = "0.11.0"
0
rand = { version = "0.9.0", default-features = false }
rand_hc = "0.4.0"
raw-cpuid = "11.3.0"
sha2 = { version = "0.10.8", default-features = false, features = ["force-soft"] }
smoltcp = { version = "0.12.0", default-features = false, features = ["alloc", "medium-ethernet", "socket-tcp", "socket-udp", "socket-dhcpv4", "proto-ipv4", "proto-dhcpv4"] }
spin = "0.9.8"
time = { version = "0.3.37", default-features = false }
time = { version = "0.2.27", default-features = false }
geodate = { version = "0.5.0", default-features = false }
uart_16550 = "0.3.2"
vte = "0.14.1"
vte = "0.13.1"
x86_64 = "0.15.2"

[package.metadata.bootloader]
Expand Down
2 changes: 1 addition & 1 deletion src/sys/idt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn interrupt_index(irq: u8) -> u8 {
fn default_handler() {}

lazy_static! {
static ref IRQ_HANDLERS: Mutex<[fn(); 16]> = { Mutex::new([default_handler; 16]) };
static ref IRQ_HANDLERS: Mutex<[fn(); 16]> = Mutex::new([default_handler; 16]);
static ref IDT: InterruptDescriptorTable = {
let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler);
Expand Down
2 changes: 1 addition & 1 deletion src/sys/net/socket/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use smoltcp::time::Duration;
use spin::Mutex;

lazy_static! {
pub static ref SOCKETS: Mutex<SocketSet<'static>> = { Mutex::new(SocketSet::new(vec![])) };
pub static ref SOCKETS: Mutex<SocketSet<'static>> = Mutex::new(SocketSet::new(vec![]));
}

fn random_port() -> u16 {
Expand Down
2 changes: 1 addition & 1 deletion src/sys/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub static MAX_PID: AtomicUsize = AtomicUsize::new(1);

lazy_static! {
pub static ref PROCESS_TABLE: RwLock<[Box<Process>; MAX_PROCS]> =
{ RwLock::new([(); MAX_PROCS].map(|_| Box::new(Process::new()))) };
RwLock::new([(); MAX_PROCS].map(|_| Box::new(Process::new())));
}

// Called during kernel heap initialization
Expand Down

0 comments on commit 8b5b6e2

Please sign in to comment.