diff --git a/lupos/.cargo/config.toml b/.cargo/config.toml similarity index 100% rename from lupos/.cargo/config.toml rename to .cargo/config.toml diff --git a/lupos/Cargo.lock b/Cargo.lock similarity index 94% rename from lupos/Cargo.lock rename to Cargo.lock index ed82de6..ec306b2 100644 --- a/lupos/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "autocfg" @@ -28,9 +28,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bootloader" -version = "0.9.29" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365861702868e2a37b4247aaecc7bd8f4389baec8d025497ad8ba7ff37ee9440" +checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447" [[package]] name = "lazy_static" @@ -142,9 +142,9 @@ checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" [[package]] name = "x86_64" -version = "0.14.12" +version = "0.14.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cb6fd45bfeab6a5055c5bffdb08768bd0c069f1d946debe585bbb380a7c062" +checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491" dependencies = [ "bit_field", "bitflags 2.5.0", diff --git a/lupos/Cargo.toml b/Cargo.toml similarity index 92% rename from lupos/Cargo.toml rename to Cargo.toml index 1059dda..6c241dc 100644 --- a/lupos/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,11 @@ name = "lupos" version = "0.1.0" edition = "2021" +[[bin]] +name = "lupos" +test = false +bench = false + [[test]] name = "should_panic" harness = false diff --git a/lupos/target/.rustc_info.json b/lupos/target/.rustc_info.json deleted file mode 100644 index 6c405ca..0000000 --- a/lupos/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":9721516820068853826,"outputs":{"7971740275564407648":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/kuro/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"17747080675513052775":{"success":true,"status":"","code":0,"stdout":"rustc 1.88.0 (6b00bc388 2025-06-23)\nbinary: rustc\ncommit-hash: 6b00bc3880198600130e1cf62b8f8a93494488cc\ncommit-date: 2025-06-23\nhost: x86_64-unknown-linux-gnu\nrelease: 1.88.0\nLLVM version: 20.1.5\n","stderr":""},"17176222793216693274":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.a\n/home/kuro/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\n___\ndebug_assertions\npanic=\"abort\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"none\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\n","stderr":"warning: dropping unsupported crate type `dylib` for target `x86_64-lupos-7114822090336562849`\n\nwarning: dropping unsupported crate type `cdylib` for target `x86_64-lupos-7114822090336562849`\n\nwarning: dropping unsupported crate type `proc-macro` for target `x86_64-lupos-7114822090336562849`\n\nwarning: 3 warnings emitted\n\n"}},"successes":{}} \ No newline at end of file diff --git a/lupos/target/CACHEDIR.TAG b/lupos/target/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/lupos/target/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/lupos/target/debug/.cargo-lock b/lupos/target/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/dep-lib-autocfg b/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/dep-lib-autocfg deleted file mode 100644 index ec3cb8b..0000000 Binary files a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/dep-lib-autocfg and /dev/null differ diff --git a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/invoked.timestamp b/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg b/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg deleted file mode 100644 index 3c80fbb..0000000 --- a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg +++ /dev/null @@ -1 +0,0 @@ -eea9e1e123b6fcee \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg.json b/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg.json deleted file mode 100644 index c940aa7..0000000 --- a/lupos/target/debug/.fingerprint/autocfg-f637408b92512aff/lib-autocfg.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"[]","declared_features":"[]","target":2631145339540467737,"profile":15657897354478470176,"path":16368167904557839573,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/autocfg-f637408b92512aff/dep-lib-autocfg","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build b/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build deleted file mode 100644 index b0dce26..0000000 --- a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -41faad2d5efbad37 \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build.json b/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build.json deleted file mode 100644 index d0dbb67..0000000 --- a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"[\"atomic_usize\", \"default\"]","declared_features":"[\"arc_lock\", \"atomic_usize\", \"default\", \"nightly\", \"owning_ref\", \"serde\"]","target":5408242616063297496,"profile":15657897354478470176,"path":7087945900580463103,"deps":[[13144054769777252793,"autocfg",false,17220839340387707374]],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/lock_api-fcc35de80a5c58ca/dep-build-script-build-script-build","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/dep-build-script-build-script-build b/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/dep-build-script-build-script-build deleted file mode 100644 index ec3cb8b..0000000 Binary files a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/dep-build-script-build-script-build and /dev/null differ diff --git a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/invoked.timestamp b/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/debug/.fingerprint/lock_api-fcc35de80a5c58ca/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build b/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build deleted file mode 100644 index 461a718..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -3330adfdf14fd743 \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build.json b/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build.json deleted file mode 100644 index a731ebe..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"[]","declared_features":"[]","target":17883862002600103897,"profile":15657897354478470176,"path":8285137917955936608,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/rustversion-6b96e39082410648/dep-build-script-build-script-build","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/dep-build-script-build-script-build b/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/dep-build-script-build-script-build deleted file mode 100644 index ec3cb8b..0000000 Binary files a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/dep-build-script-build-script-build and /dev/null differ diff --git a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/invoked.timestamp b/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-6b96e39082410648/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build b/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build deleted file mode 100644 index 0056d7c..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -daa51d54b9b97ca9 \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build.json b/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build.json deleted file mode 100644 index 539cb09..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-80895c343822e980/run-build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"","declared_features":"","target":0,"profile":0,"path":0,"deps":[[2228019394534197015,"build_script_build",false,4888463821295661107]],"local":[{"RerunIfChanged":{"output":"debug/build/rustversion-80895c343822e980/output","paths":["build/build.rs"]}}],"rustflags":[],"config":0,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/dep-lib-rustversion b/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/dep-lib-rustversion deleted file mode 100644 index 88b327c..0000000 Binary files a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/dep-lib-rustversion and /dev/null differ diff --git a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/invoked.timestamp b/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion b/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion deleted file mode 100644 index a7c7fb8..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion +++ /dev/null @@ -1 +0,0 @@ -2c02455b805b5fc8 \ No newline at end of file diff --git a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion.json b/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion.json deleted file mode 100644 index d8208be..0000000 --- a/lupos/target/debug/.fingerprint/rustversion-cf597c339519c569/lib-rustversion.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"[]","declared_features":"[]","target":179193587114931863,"profile":15657897354478470176,"path":7726472456311682523,"deps":[[2228019394534197015,"build_script_build",false,12212840495153259994]],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/rustversion-cf597c339519c569/dep-lib-rustversion","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build-script-build b/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build-script-build deleted file mode 100755 index f9c7796..0000000 Binary files a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build-script-build and /dev/null differ diff --git a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca b/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca deleted file mode 100755 index f9c7796..0000000 Binary files a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca and /dev/null differ diff --git a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca.d b/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca.d deleted file mode 100644 index aa68bbe..0000000 --- a/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca.d: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/lock_api-0.4.12/build.rs - -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/lock_api-fcc35de80a5c58ca/build_script_build-fcc35de80a5c58ca: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/lock_api-0.4.12/build.rs - -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/lock_api-0.4.12/build.rs: diff --git a/lupos/target/debug/build/rustversion-6b96e39082410648/build-script-build b/lupos/target/debug/build/rustversion-6b96e39082410648/build-script-build deleted file mode 100755 index 43518e5..0000000 Binary files a/lupos/target/debug/build/rustversion-6b96e39082410648/build-script-build and /dev/null differ diff --git a/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648 b/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648 deleted file mode 100755 index 43518e5..0000000 Binary files a/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648 and /dev/null differ diff --git a/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648.d b/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648.d deleted file mode 100644 index 70b4bfa..0000000 --- a/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648.d +++ /dev/null @@ -1,6 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648.d: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/build.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/rustc.rs - -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-6b96e39082410648/build_script_build-6b96e39082410648: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/build.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/rustc.rs - -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/build.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/build/rustc.rs: diff --git a/lupos/target/debug/build/rustversion-80895c343822e980/invoked.timestamp b/lupos/target/debug/build/rustversion-80895c343822e980/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/debug/build/rustversion-80895c343822e980/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr b/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr deleted file mode 100644 index 3ac9f7d..0000000 --- a/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr +++ /dev/null @@ -1,5 +0,0 @@ -crate::version::Version { - minor: 88, - patch: 0, - channel: crate::version::Channel::Stable, -} diff --git a/lupos/target/debug/build/rustversion-80895c343822e980/output b/lupos/target/debug/build/rustversion-80895c343822e980/output deleted file mode 100644 index c2182eb..0000000 --- a/lupos/target/debug/build/rustversion-80895c343822e980/output +++ /dev/null @@ -1,3 +0,0 @@ -cargo:rerun-if-changed=build/build.rs -cargo:rustc-check-cfg=cfg(cfg_macro_not_allowed) -cargo:rustc-check-cfg=cfg(host_os, values("windows")) diff --git a/lupos/target/debug/build/rustversion-80895c343822e980/root-output b/lupos/target/debug/build/rustversion-80895c343822e980/root-output deleted file mode 100644 index 00cb52c..0000000 --- a/lupos/target/debug/build/rustversion-80895c343822e980/root-output +++ /dev/null @@ -1 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-80895c343822e980/out \ No newline at end of file diff --git a/lupos/target/debug/build/rustversion-80895c343822e980/stderr b/lupos/target/debug/build/rustversion-80895c343822e980/stderr deleted file mode 100644 index e69de29..0000000 diff --git a/lupos/target/debug/deps/autocfg-f637408b92512aff.d b/lupos/target/debug/deps/autocfg-f637408b92512aff.d deleted file mode 100644 index 348fcad..0000000 --- a/lupos/target/debug/deps/autocfg-f637408b92512aff.d +++ /dev/null @@ -1,10 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/debug/deps/autocfg-f637408b92512aff.d: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/lib.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/error.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/rustc.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/version.rs - -/home/kuro/vs-workspace/LupOS/lupos/target/debug/deps/libautocfg-f637408b92512aff.rlib: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/lib.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/error.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/rustc.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/version.rs - -/home/kuro/vs-workspace/LupOS/lupos/target/debug/deps/libautocfg-f637408b92512aff.rmeta: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/lib.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/error.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/rustc.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/version.rs - -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/lib.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/error.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/rustc.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/autocfg-1.3.0/src/version.rs: diff --git a/lupos/target/debug/deps/libautocfg-f637408b92512aff.rlib b/lupos/target/debug/deps/libautocfg-f637408b92512aff.rlib deleted file mode 100644 index 253600f..0000000 Binary files a/lupos/target/debug/deps/libautocfg-f637408b92512aff.rlib and /dev/null differ diff --git a/lupos/target/debug/deps/libautocfg-f637408b92512aff.rmeta b/lupos/target/debug/deps/libautocfg-f637408b92512aff.rmeta deleted file mode 100644 index 5d078e8..0000000 Binary files a/lupos/target/debug/deps/libautocfg-f637408b92512aff.rmeta and /dev/null differ diff --git a/lupos/target/debug/deps/librustversion-cf597c339519c569.so b/lupos/target/debug/deps/librustversion-cf597c339519c569.so deleted file mode 100755 index 24feb4c..0000000 Binary files a/lupos/target/debug/deps/librustversion-cf597c339519c569.so and /dev/null differ diff --git a/lupos/target/debug/deps/rustversion-cf597c339519c569.d b/lupos/target/debug/deps/rustversion-cf597c339519c569.d deleted file mode 100644 index 1f40826..0000000 --- a/lupos/target/debug/deps/rustversion-cf597c339519c569.d +++ /dev/null @@ -1,20 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/debug/deps/rustversion-cf597c339519c569.d: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/lib.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/attr.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/bound.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/constfn.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/date.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/error.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expand.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expr.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/iter.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/release.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/time.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/token.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/version.rs /home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr - -/home/kuro/vs-workspace/LupOS/lupos/target/debug/deps/librustversion-cf597c339519c569.so: /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/lib.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/attr.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/bound.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/constfn.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/date.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/error.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expand.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expr.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/iter.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/release.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/time.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/token.rs /home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/version.rs /home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr - -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/lib.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/attr.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/bound.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/constfn.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/date.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/error.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expand.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/expr.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/iter.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/release.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/time.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/token.rs: -/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustversion-1.0.17/src/version.rs: -/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-80895c343822e980/out/version.expr: - -# env-dep:OUT_DIR=/home/kuro/vs-workspace/LupOS/lupos/target/debug/build/rustversion-80895c343822e980/out diff --git a/lupos/target/x86_64-lupos/CACHEDIR.TAG b/lupos/target/x86_64-lupos/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/lupos/target/x86_64-lupos/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/lupos/target/x86_64-lupos/debug/.cargo-lock b/lupos/target/x86_64-lupos/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/bit_field-bde752551c203be4/invoked.timestamp b/lupos/target/x86_64-lupos/debug/.fingerprint/bit_field-bde752551c203be4/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/bit_field-bde752551c203be4/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/invoked.timestamp b/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/output-lib-bitflags b/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/output-lib-bitflags deleted file mode 100644 index 09f0c83..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/bitflags-e1e6fea32e86a07b/output-lib-bitflags +++ /dev/null @@ -1,3 +0,0 @@ -{"$message_type":"diagnostic","message":"can't find crate for `core`","code":{"code":"E0463","explanation":"A crate was declared but cannot be found.\n\nErroneous code example:\n\n```compile_fail,E0463\nextern crate foo; // error: can't find crate\n```\n\nYou need to link your code to the relevant crate in order to be able to use it\n(through Cargo or the `-L` option of rustc, for example).\n\n## Common causes\n\n- The crate is not present at all. If using Cargo, add it to `[dependencies]`\n in Cargo.toml.\n- The crate is present, but under a different name. If using Cargo, look for\n `package = ` under `[dependencies]` in Cargo.toml.\n\n## Common causes for missing `std` or `core`\n\n- You are cross-compiling for a target which doesn't have `std` prepackaged.\n Consider one of the following:\n + Adding a pre-compiled version of std with `rustup target add`\n + Building std from source with `cargo build -Z build-std`\n + Using `#![no_std]` at the crate root, so you won't need `std` in the first\n place.\n- You are developing the compiler itself and haven't built libstd from source.\n You can usually build it with `x.py build library/std`. More information\n about x.py is available in the [rustc-dev-guide].\n\n[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html#building-the-compiler\n"},"level":"error","spans":[{"file_name":"/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/bitflags-2.5.0/src/lib.rs","byte_start":0,"byte_end":0,"line_start":1,"line_end":1,"column_start":1,"column_end":1,"is_primary":true,"text":[],"label":"can't find crate","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"the `x86_64-lupos` target may not be installed","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"consider downloading the target with `rustup target add x86_64-lupos`","code":null,"level":"help","spans":[],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[38;5;9merror[E0463]\u001b[0m\u001b[0m\u001b[1m: can't find crate for `core`\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mnote\u001b[0m\u001b[0m: the `x86_64-lupos` target may not be installed\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mhelp\u001b[0m\u001b[0m: consider downloading the target with `rustup target add x86_64-lupos`\u001b[0m\n\n"} -{"$message_type":"diagnostic","message":"aborting due to 1 previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1m\u001b[38;5;9merror\u001b[0m\u001b[0m\u001b[1m: aborting due to 1 previous error\u001b[0m\n\n"} -{"$message_type":"diagnostic","message":"For more information about this error, try `rustc --explain E0463`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1mFor more information about this error, try `rustc --explain E0463`.\u001b[0m\n"} diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build b/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build deleted file mode 100644 index fefeda3..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -724a9f581fd733e6 \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build.json b/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build.json deleted file mode 100644 index bf90ee9..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/lock_api-2de7117dbaa0347d/run-build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":11410426090777951712,"features":"","declared_features":"","target":0,"profile":0,"path":0,"deps":[[4796557380116975802,"build_script_build",false,4012139224968854081]],"local":[{"Precalculated":"0.4.12"}],"rustflags":[],"config":0,"compile_kind":0} \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/invoked.timestamp b/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/output-lib-scopeguard b/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/output-lib-scopeguard deleted file mode 100644 index 98e3846..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/scopeguard-7e808608a84a0678/output-lib-scopeguard +++ /dev/null @@ -1,3 +0,0 @@ -{"$message_type":"diagnostic","message":"can't find crate for `core`","code":{"code":"E0463","explanation":"A crate was declared but cannot be found.\n\nErroneous code example:\n\n```compile_fail,E0463\nextern crate foo; // error: can't find crate\n```\n\nYou need to link your code to the relevant crate in order to be able to use it\n(through Cargo or the `-L` option of rustc, for example).\n\n## Common causes\n\n- The crate is not present at all. If using Cargo, add it to `[dependencies]`\n in Cargo.toml.\n- The crate is present, but under a different name. If using Cargo, look for\n `package = ` under `[dependencies]` in Cargo.toml.\n\n## Common causes for missing `std` or `core`\n\n- You are cross-compiling for a target which doesn't have `std` prepackaged.\n Consider one of the following:\n + Adding a pre-compiled version of std with `rustup target add`\n + Building std from source with `cargo build -Z build-std`\n + Using `#![no_std]` at the crate root, so you won't need `std` in the first\n place.\n- You are developing the compiler itself and haven't built libstd from source.\n You can usually build it with `x.py build library/std`. More information\n about x.py is available in the [rustc-dev-guide].\n\n[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html#building-the-compiler\n"},"level":"error","spans":[{"file_name":"/home/kuro/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/scopeguard-1.2.0/src/lib.rs","byte_start":0,"byte_end":0,"line_start":1,"line_end":1,"column_start":1,"column_end":1,"is_primary":true,"text":[],"label":"can't find crate","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"the `x86_64-lupos` target may not be installed","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"consider downloading the target with `rustup target add x86_64-lupos`","code":null,"level":"help","spans":[],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[38;5;9merror[E0463]\u001b[0m\u001b[0m\u001b[1m: can't find crate for `core`\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mnote\u001b[0m\u001b[0m: the `x86_64-lupos` target may not be installed\u001b[0m\n\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mhelp\u001b[0m\u001b[0m: consider downloading the target with `rustup target add x86_64-lupos`\u001b[0m\n\n"} -{"$message_type":"diagnostic","message":"aborting due to 1 previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1m\u001b[38;5;9merror\u001b[0m\u001b[0m\u001b[1m: aborting due to 1 previous error\u001b[0m\n\n"} -{"$message_type":"diagnostic","message":"For more information about this error, try `rustc --explain E0463`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1mFor more information about this error, try `rustc --explain E0463`.\u001b[0m\n"} diff --git a/lupos/target/x86_64-lupos/debug/.fingerprint/volatile-021319eea23380d9/invoked.timestamp b/lupos/target/x86_64-lupos/debug/.fingerprint/volatile-021319eea23380d9/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/x86_64-lupos/debug/.fingerprint/volatile-021319eea23380d9/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/invoked.timestamp b/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/output b/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/output deleted file mode 100644 index ad552e5..0000000 --- a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/output +++ /dev/null @@ -1 +0,0 @@ -cargo:rustc-cfg=has_const_fn_trait_bound diff --git a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/root-output b/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/root-output deleted file mode 100644 index 2e535a7..0000000 --- a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/root-output +++ /dev/null @@ -1 +0,0 @@ -/home/kuro/vs-workspace/LupOS/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/out \ No newline at end of file diff --git a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/stderr b/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/stderr deleted file mode 100644 index e65b130..0000000 --- a/lupos/target/x86_64-lupos/debug/build/lock_api-2de7117dbaa0347d/stderr +++ /dev/null @@ -1,9 +0,0 @@ -error: error loading target specification: could not find specification for target "x86_64-lupos" - | - = help: run `rustc --print target-list` for a list of built-in targets - -error: error loading target specification: could not find specification for target "x86_64-lupos" - | - = help: run `rustc --print target-list` for a list of built-in targets - -warning: autocfg could not probe for `std` diff --git a/lupos/src/allocator.rs b/src/allocator.rs similarity index 97% rename from lupos/src/allocator.rs rename to src/allocator.rs index c60c787..1e942c0 100644 --- a/lupos/src/allocator.rs +++ b/src/allocator.rs @@ -71,7 +71,7 @@ impl Locked { } } - pub fn lock(&self) -> spin::MutexGuard { + pub fn lock(&self) -> spin::MutexGuard<'_, A> { self.inner.lock() } } diff --git a/lupos/src/allocator/bump.rs b/src/allocator/bump.rs similarity index 100% rename from lupos/src/allocator/bump.rs rename to src/allocator/bump.rs diff --git a/lupos/src/allocator/fixed_size_block.rs b/src/allocator/fixed_size_block.rs similarity index 100% rename from lupos/src/allocator/fixed_size_block.rs rename to src/allocator/fixed_size_block.rs diff --git a/lupos/src/allocator/linked_list.rs b/src/allocator/linked_list.rs similarity index 100% rename from lupos/src/allocator/linked_list.rs rename to src/allocator/linked_list.rs diff --git a/lupos/src/gdt.rs b/src/gdt.rs similarity index 100% rename from lupos/src/gdt.rs rename to src/gdt.rs diff --git a/lupos/src/interrupts.rs b/src/interrupts.rs similarity index 100% rename from lupos/src/interrupts.rs rename to src/interrupts.rs diff --git a/lupos/src/keyboard_interrupts.rs b/src/keyboard_interrupts.rs similarity index 97% rename from lupos/src/keyboard_interrupts.rs rename to src/keyboard_interrupts.rs index 7b3a356..6acf6f5 100644 --- a/lupos/src/keyboard_interrupts.rs +++ b/src/keyboard_interrupts.rs @@ -1,6 +1,4 @@ -use crate::println; use crate::print; -use crate::vga_buffer::WRITER; use lazy_static::lazy_static; use crate::move_cursor_back; use crate::simple_commands; diff --git a/lupos/src/lib.rs b/src/lib.rs similarity index 100% rename from lupos/src/lib.rs rename to src/lib.rs diff --git a/lupos/src/main.rs b/src/main.rs similarity index 94% rename from lupos/src/main.rs rename to src/main.rs index 4006e74..d8b155c 100644 --- a/lupos/src/main.rs +++ b/src/main.rs @@ -1,15 +1,13 @@ #![no_std] #![no_main] #![feature(custom_test_frameworks)] -#![feature(const_mut_refs)] #![test_runner(lupos::test_runner)] #![reexport_test_harness_main = "test_main"] use core::panic::PanicInfo; use lupos::println; -use lupos:: print; use bootloader::{BootInfo, entry_point}; -use alloc::{boxed::Box, vec, vec::Vec, rc::Rc}; +use alloc::{vec, rc::Rc}; extern crate alloc; diff --git a/lupos/src/memory.rs b/src/memory.rs similarity index 100% rename from lupos/src/memory.rs rename to src/memory.rs diff --git a/lupos/src/serial.rs b/src/serial.rs similarity index 100% rename from lupos/src/serial.rs rename to src/serial.rs diff --git a/lupos/src/simple_commands.rs b/src/simple_commands.rs similarity index 93% rename from lupos/src/simple_commands.rs rename to src/simple_commands.rs index f58ebf8..f9266e5 100644 --- a/lupos/src/simple_commands.rs +++ b/src/simple_commands.rs @@ -1,5 +1,4 @@ use crate::println; -use crate::print; pub fn simple_commands_help() { println!("List of simple commands:"); diff --git a/lupos/src/vga_buffer.rs b/src/vga_buffer.rs similarity index 98% rename from lupos/src/vga_buffer.rs rename to src/vga_buffer.rs index 2aec611..f739b0a 100644 --- a/lupos/src/vga_buffer.rs +++ b/src/vga_buffer.rs @@ -110,14 +110,12 @@ impl Writer { } -use alloc::borrow::ToOwned; use volatile::Volatile; struct Buffer { chars: [[Volatile; BUFFER_WIDTH]; BUFFER_HEIGHT], } -use core::borrow::{Borrow, BorrowMut}; use core::fmt; impl fmt::Write for Writer { diff --git a/lupos/tests/basic_boot.rs b/tests/basic_boot.rs similarity index 100% rename from lupos/tests/basic_boot.rs rename to tests/basic_boot.rs diff --git a/lupos/tests/heap_allocation.rs b/tests/heap_allocation.rs similarity index 100% rename from lupos/tests/heap_allocation.rs rename to tests/heap_allocation.rs diff --git a/lupos/tests/should_panic.rs b/tests/should_panic.rs similarity index 100% rename from lupos/tests/should_panic.rs rename to tests/should_panic.rs diff --git a/lupos/tests/stack_overflow.rs b/tests/stack_overflow.rs similarity index 100% rename from lupos/tests/stack_overflow.rs rename to tests/stack_overflow.rs diff --git a/lupos/x86_64-lupos.json b/x86_64-lupos.json similarity index 84% rename from lupos/x86_64-lupos.json rename to x86_64-lupos.json index 79cb3e1..6a4ee44 100644 --- a/lupos/x86_64-lupos.json +++ b/x86_64-lupos.json @@ -3,8 +3,8 @@ "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", - "target-pointer-width": "64", - "target-c-int-width": "32", + "target-pointer-width": 64, + "target-c-int-width": 32, "os": "none", "executables": true, "linker-flavor": "ld.lld",