From d687fd4e39bdedb40ec08d26cdcc44561c7af0de Mon Sep 17 00:00:00 2001
From: Erin <erin@erindesu.cz>
Date: Mon, 25 Apr 2022 22:34:52 +0200
Subject: [PATCH] Changed naming of things to match Rust's conventions
---
ableos/src/arch/x86_64/init.rs | 4 ++--
ableos/src/scheduler/mod.rs | 4 ++--
ableos/src/scheduler/proc.rs | 4 ++--
ableos/src/stdio.rs | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ableos/src/arch/x86_64/init.rs b/ableos/src/arch/x86_64/init.rs
index 4da5aeb..18da0c2 100644
--- a/ableos/src/arch/x86_64/init.rs
+++ b/ableos/src/arch/x86_64/init.rs
@@ -10,7 +10,7 @@ use crate::{
pub fn init() {
use crate::{
network::socket::SimpleSock, relib::network::socket::Socket,
- scheduler::priority::Priority::High, stdio::StdIO,
+ scheduler::priority::Priority::High, stdio::StdIo,
};
let mut log_socket_id = SimpleSock::new();
@@ -31,7 +31,7 @@ pub fn init() {
Capabilities::empty(),
High,
"".to_string(),
- StdIO::new("null".to_string()),
+ StdIo::new("null".to_string()),
);
scheduler.add_process(process_0);
drop(scheduler);
diff --git a/ableos/src/scheduler/mod.rs b/ableos/src/scheduler/mod.rs
index 0b10232..875a7e4 100644
--- a/ableos/src/scheduler/mod.rs
+++ b/ableos/src/scheduler/mod.rs
@@ -3,7 +3,7 @@ pub mod priority;
pub mod proc;
use crate::scheduler::capabilities::Capabilities;
-use crate::{arch::generate_process_pass, stdio::StdIO};
+use crate::{arch::generate_process_pass, stdio::StdIo};
use kernel::proccess::PID;
use priority::Priority;
use proc::Process;
@@ -70,7 +70,7 @@ impl Scheduler {
capabilities: Capabilities,
priority: Priority,
working_dir: String,
- stdio: StdIO,
+ stdio: StdIo,
) -> Process {
Process {
pid: 0,
diff --git a/ableos/src/scheduler/proc.rs b/ableos/src/scheduler/proc.rs
index 225331b..1770f07 100644
--- a/ableos/src/scheduler/proc.rs
+++ b/ableos/src/scheduler/proc.rs
@@ -2,7 +2,7 @@
use super::capabilities::Capabilities;
use super::priority::Priority;
-use crate::stdio::StdIO;
+use crate::stdio::StdIo;
use kernel::proccess::PID;
/// A process
@@ -20,5 +20,5 @@ pub struct Process {
/// A process's current working directory
pub working_dir: String,
- pub stdio: StdIO,
+ pub stdio: StdIo,
}
diff --git a/ableos/src/stdio.rs b/ableos/src/stdio.rs
index f69a2e3..b69b2ea 100644
--- a/ableos/src/stdio.rs
+++ b/ableos/src/stdio.rs
@@ -5,13 +5,13 @@ use {
};
#[derive(Debug, Clone)]
-pub struct StdIO {
+pub struct StdIo {
device: String,
}
-impl StdIO {
- pub fn new(device: String) -> StdIO {
- StdIO { device }
+impl StdIo {
+ pub fn new(device: String) -> StdIo {
+ StdIo { device }
}
pub fn write(&mut self, args: Arguments) -> Result<(), Error> {
use crate::devices::DEVICE_TABLE;