diff --git a/Cargo.lock b/Cargo.lock index d5a11c1f9d66063337190e87304e32f3bd256bb9..3bcd55b41113835f9d4204fbb471f30247ee1d7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,10 +88,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "core" -version = "0.1.0" - [[package]] name = "cpufeatures" version = "0.2.5" @@ -232,6 +228,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" +[[package]] +name = "kernel" +version = "0.1.0" + [[package]] name = "libc" version = "0.2.133" @@ -295,7 +295,7 @@ checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" name = "parser" version = "0.1.0" dependencies = [ - "core", + "kernel", "pest", "pest_derive", ] @@ -382,7 +382,6 @@ name = "proost" version = "0.1.0" dependencies = [ "clap", - "core", "parser", "rustyline", ] diff --git a/Cargo.toml b/Cargo.toml index 0ce646b9bc81ddad6f5c796c7554ae670be28d35..55997769a27dbc960b633c84c6d5e5dc0000a037 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ - "core", + "kernel", "parser", "proost", ] diff --git a/core/Cargo.toml b/core/Cargo.toml deleted file mode 100644 index 8eb1f6f527a54d4edfc83a5811ad93802818c6e7..0000000000000000000000000000000000000000 --- a/core/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "core" -version = "0.1.0" -edition = "2021" -license = "GPL-3.0-or-later" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml new file mode 100644 index 0000000000000000000000000000000000000000..9b5555a1a804ca715889e64b26feea6fc6304f36 --- /dev/null +++ b/kernel/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "kernel" +version = "0.1.0" +edition = "2021" +license = "GPL-3.0-or-later" + +[dependencies] diff --git a/core/src/command.rs b/kernel/src/command.rs similarity index 100% rename from core/src/command.rs rename to kernel/src/command.rs diff --git a/core/src/lib.rs b/kernel/src/lib.rs similarity index 100% rename from core/src/lib.rs rename to kernel/src/lib.rs diff --git a/core/src/term.rs b/kernel/src/term.rs similarity index 100% rename from core/src/term.rs rename to kernel/src/term.rs diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 6b0ee02b7bc5ef3dc6a56ea1e0de1aeef2847a45..03b8c00d5a7a1c030e18840854bf5f3a8df9090e 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -4,10 +4,9 @@ version = "0.1.0" edition = "2021" license = "GPL-3.0-or-later" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -core = { path = "../core" } +kernel = { path = "../kernel" } + pest = "2.0" pest_derive = "2.0" diff --git a/parser/src/classic_term.rs b/parser/src/classic_term.rs index b7408f307c249964e90b24e832a25de55cc03d06..2de98ee0ece029429bf8d57381ed2d0132cebb95 100644 --- a/parser/src/classic_term.rs +++ b/parser/src/classic_term.rs @@ -1,4 +1,4 @@ -use core::Term; +use kernel::Term; use std::fmt::{Display, Formatter}; #[derive(Clone, Debug)] diff --git a/parser/src/parser.rs b/parser/src/parser.rs index 035ef5ffb35e3262e5a9a545ac0d9e30d2312c42..d23ace613ef2c32a07e5a02d461cc38c37c4d783 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -1,5 +1,5 @@ use crate::classic_term::ClassicTerm; -use core::{Command, Term}; +use kernel::{Command, Term}; use pest::error::{Error, ErrorVariant}; use pest::iterators::Pair; use pest::{Parser, Position}; diff --git a/parser/tests/example.rs b/parser/tests/example.rs index c4e288200f8f6aa0fc711af5b3f7a5ce1dcf82f1..0ee5ead7c70522904a9ab4aaa1896640337c40c6 100644 --- a/parser/tests/example.rs +++ b/parser/tests/example.rs @@ -1,4 +1,4 @@ -use core::{Command, Term}; +use kernel::{Command, Term}; #[test] fn parse() { diff --git a/proost/Cargo.toml b/proost/Cargo.toml index 5d15b560fb70b01399599172bc6f260e7dab38d9..5f9cb37f7fa04669c9df79267d1ee4cdcf3ce504 100644 --- a/proost/Cargo.toml +++ b/proost/Cargo.toml @@ -6,7 +6,7 @@ license = "GPL-3.0-or-later" description = "A simple proof assistant written in Rust" [dependencies] -core = { path = "../core" } parser = { path = "../parser" } -rustyline = "10.0.0" + clap = { version = "4.0.10", features = ["derive"]} +rustyline = "10.0.0"