From ebb4935f56e96597e5993708118cc75711c1c87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Tue, 24 Nov 2020 15:14:19 +0100
Subject: rename kernel -> kernel-rs

---
 kernel-rs/Cargo.toml     | 22 ++++++++++++++++++++++
 kernel-rs/rust-toolchain |  1 +
 kernel-rs/src/lib.rs     | 17 +++++++++++++++++
 kernel/Cargo.toml        | 22 ----------------------
 kernel/rust-toolchain    |  1 -
 kernel/src/lib.rs        | 17 -----------------
 src/Makefile.build       |  2 +-
 7 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 kernel-rs/Cargo.toml
 create mode 100644 kernel-rs/rust-toolchain
 create mode 100644 kernel-rs/src/lib.rs
 delete mode 100644 kernel/Cargo.toml
 delete mode 100644 kernel/rust-toolchain
 delete mode 100644 kernel/src/lib.rs

diff --git a/kernel-rs/Cargo.toml b/kernel-rs/Cargo.toml
new file mode 100644
index 0000000..738559f
--- /dev/null
+++ b/kernel-rs/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "kernel"
+version = "0.1.0"
+authors = ["Gustav Sörnäs <gustav@sornas.net>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+name = "kernel"
+crate-type = ["staticlib"]
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"
+
+[dependencies.libc]
+version = "0.2"
+default-features = false
+features = ["extra_traits"]
diff --git a/kernel-rs/rust-toolchain b/kernel-rs/rust-toolchain
new file mode 100644
index 0000000..adfa491
--- /dev/null
+++ b/kernel-rs/rust-toolchain
@@ -0,0 +1 @@
+nightly-i686-unknown-linux-gnu
diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
new file mode 100644
index 0000000..7893919
--- /dev/null
+++ b/kernel-rs/src/lib.rs
@@ -0,0 +1,17 @@
+#![no_std]
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn syscall_handler() {
+    printf("c suger lmao xd %d\n".as_ptr(), 69);
+    thread_exit();
+}
+
+extern {
+    fn thread_exit();
+    fn printf(format: *const u8, ...);
+}
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
deleted file mode 100644
index 738559f..0000000
--- a/kernel/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "kernel"
-version = "0.1.0"
-authors = ["Gustav Sörnäs <gustav@sornas.net>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "kernel"
-crate-type = ["staticlib"]
-
-[profile.dev]
-panic = "abort"
-
-[profile.release]
-panic = "abort"
-
-[dependencies.libc]
-version = "0.2"
-default-features = false
-features = ["extra_traits"]
diff --git a/kernel/rust-toolchain b/kernel/rust-toolchain
deleted file mode 100644
index adfa491..0000000
--- a/kernel/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-i686-unknown-linux-gnu
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
deleted file mode 100644
index 7893919..0000000
--- a/kernel/src/lib.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#![no_std]
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn syscall_handler() {
-    printf("c suger lmao xd %d\n".as_ptr(), 69);
-    thread_exit();
-}
-
-extern {
-    fn thread_exit();
-    fn printf(format: *const u8, ...);
-}
diff --git a/src/Makefile.build b/src/Makefile.build
index 1f0fa35..22de06f 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -78,7 +78,7 @@ DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
 threads/kernel.lds.s: CPPFLAGS += -P
 threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
 
-LIBDIR_RUST = $(SRCDIR)/../kernel
+LIBDIR_RUST = $(SRCDIR)/../kernel-rs
 
 LIB_RUST = libkernel-rs.a
 
-- 
cgit v1.2.1