From 8407d1628b1eed4244d288bf7219062f0b25dba3 Mon Sep 17 00:00:00 2001
From: v-lafeychine <vincent.lafeychine@proton.me>
Date: Fri, 7 Oct 2022 19:30:36 +0200
Subject: [PATCH] =?UTF-8?q?Resolve=20"Breaking=20change:=20Rename=20`core`?=
=?UTF-8?q?=20crate=20to=20`kernel`"=20=E2=9C=A8=EF=B8=8F=20Closes=20#13?=
=?UTF-8?q?=20=F0=9F=90=94=EF=B8=8F=F0=9F=91=8D=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
🦀ï¸ðŸ°ðŸ¦€ï¸ðŸ°ðŸ¦€ï¸ðŸ°
* chore!(cargo): Rename crate into
---
Cargo.lock | 11 +++++------
Cargo.toml | 2 +-
core/Cargo.toml | 9 ---------
kernel/Cargo.toml | 7 +++++++
{core => kernel}/src/command.rs | 0
{core => kernel}/src/lib.rs | 0
{core => kernel}/src/term.rs | 0
parser/Cargo.toml | 5 ++---
parser/src/classic_term.rs | 2 +-
parser/src/parser.rs | 2 +-
parser/tests/example.rs | 2 +-
proost/Cargo.toml | 4 ++--
12 files changed, 20 insertions(+), 24 deletions(-)
delete mode 100644 core/Cargo.toml
create mode 100644 kernel/Cargo.toml
rename {core => kernel}/src/command.rs (100%)
rename {core => kernel}/src/lib.rs (100%)
rename {core => kernel}/src/term.rs (100%)
diff --git a/Cargo.lock b/Cargo.lock
index d5a11c1f..3bcd55b4 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 0ce646b9..55997769 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 8eb1f6f5..00000000
--- 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 00000000..9b5555a1
--- /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 6b0ee02b..03b8c00d 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 b7408f30..2de98ee0 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 035ef5ff..d23ace61 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 c4e28820..0ee5ead7 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 5d15b560..5f9cb37f 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"
--
GitLab