From 245c1a1ec68298caefcf9ceee1bc8ad4d72489d3 Mon Sep 17 00:00:00 2001 From: ThePuzzlemaker Date: Sun, 15 Jan 2023 15:15:21 -0600 Subject: [PATCH] Delete `calypso_opt` and `calypso_util` and yank These currently do not contain anything and just clutter up everything. Eventually pretty much most of Calypso will just be in the `calypso` crate, except for things shared between Calypso and SaturnVM --this will make things much easier with respect to organization. --- Cargo.lock | 9 --------- libs/calypso_opt/Cargo.toml | 14 -------------- libs/calypso_opt/LICENSE-APACHE | 1 - libs/calypso_opt/LICENSE-MIT | 1 - libs/calypso_opt/src/lib.rs | 2 -- libs/calypso_parsing/Cargo.toml | 1 - libs/calypso_util/Cargo.toml | 15 --------------- libs/calypso_util/LICENSE-APACHE | 1 - libs/calypso_util/LICENSE-MIT | 1 - libs/calypso_util/src/lib.rs | 2 -- 10 files changed, 47 deletions(-) delete mode 100644 libs/calypso_opt/Cargo.toml delete mode 120000 libs/calypso_opt/LICENSE-APACHE delete mode 120000 libs/calypso_opt/LICENSE-MIT delete mode 100644 libs/calypso_opt/src/lib.rs delete mode 100644 libs/calypso_util/Cargo.toml delete mode 120000 libs/calypso_util/LICENSE-APACHE delete mode 120000 libs/calypso_util/LICENSE-MIT delete mode 100644 libs/calypso_util/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index dcdccdd3..6f9dba3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,6 @@ dependencies = [ "calypso_base", "calypso_common", "calypso_diagnostic", - "calypso_util", "itertools", "lalrpop", "lalrpop-util", @@ -184,14 +183,6 @@ dependencies = [ "rustyline", ] -[[package]] -name = "calypso_util" -version = "0.1.0" -dependencies = [ - "calypso_base", - "calypso_diagnostic", -] - [[package]] name = "cc" version = "1.0.78" diff --git a/libs/calypso_opt/Cargo.toml b/libs/calypso_opt/Cargo.toml deleted file mode 100644 index 49450100..00000000 --- a/libs/calypso_opt/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "calypso_opt" -version = "0.1.0" -authors = ["ThePuzzlemaker "] -edition = "2021" -description = "Calypso optimization passes" -readme = "README.md" -homepage = "https://github.com/calypso-lang/calypso/tree/main/libs/calypso_opt" -repository = "https://github.com/calypso-lang/calypso/" -license = "MIT OR Apache-2.0" -rust-version = "1.66.1" - -[dependencies] -calypso_parsing = { path = "../calypso_parsing", version = "0.1.0" } diff --git a/libs/calypso_opt/LICENSE-APACHE b/libs/calypso_opt/LICENSE-APACHE deleted file mode 120000 index 1cd601d0..00000000 --- a/libs/calypso_opt/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-APACHE \ No newline at end of file diff --git a/libs/calypso_opt/LICENSE-MIT b/libs/calypso_opt/LICENSE-MIT deleted file mode 120000 index b2cfbdc7..00000000 --- a/libs/calypso_opt/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-MIT \ No newline at end of file diff --git a/libs/calypso_opt/src/lib.rs b/libs/calypso_opt/src/lib.rs deleted file mode 100644 index 8db8591a..00000000 --- a/libs/calypso_opt/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -#![doc(html_root_url = "https://calypso-lang.github.io/rustdoc/calypso_opt/index.html")] -#![warn(clippy::pedantic)] diff --git a/libs/calypso_parsing/Cargo.toml b/libs/calypso_parsing/Cargo.toml index 56ab45da..86869d22 100644 --- a/libs/calypso_parsing/Cargo.toml +++ b/libs/calypso_parsing/Cargo.toml @@ -12,7 +12,6 @@ build = "build.rs" rust-version = "1.66.1" [dependencies] -calypso_util = { path = "../calypso_util", version = "0.1.0" } calypso_diagnostic = { path = "../calypso_diagnostic", version = "0.1.0" } calypso_base = { path = "../calypso_base", version = "0.1.0" } calypso_common = { path = "../calypso_common", version = "0.1.0" } diff --git a/libs/calypso_util/Cargo.toml b/libs/calypso_util/Cargo.toml deleted file mode 100644 index 0d7e394b..00000000 --- a/libs/calypso_util/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "calypso_util" -version = "0.1.0" -authors = ["ThePuzzlemaker "] -edition = "2021" -description = "Utilities for Calypso" -readme = "README.md" -homepage = "https://github.com/calypso-lang/calypso/tree/main/libs/calypso_util" -repository = "https://github.com/calypso-lang/calypso/" -license = "MIT OR Apache-2.0" -rust-version = "1.66.1" - -[dependencies] -calypso_diagnostic = { path = "../calypso_diagnostic", version = "0.1.0" } -calypso_base = { path = "../calypso_base", version = "0.1.0" } diff --git a/libs/calypso_util/LICENSE-APACHE b/libs/calypso_util/LICENSE-APACHE deleted file mode 120000 index 1cd601d0..00000000 --- a/libs/calypso_util/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-APACHE \ No newline at end of file diff --git a/libs/calypso_util/LICENSE-MIT b/libs/calypso_util/LICENSE-MIT deleted file mode 120000 index b2cfbdc7..00000000 --- a/libs/calypso_util/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-MIT \ No newline at end of file diff --git a/libs/calypso_util/src/lib.rs b/libs/calypso_util/src/lib.rs deleted file mode 100644 index fe4096e9..00000000 --- a/libs/calypso_util/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -#![doc(html_root_url = "https://calypso-lang.github.io/rustdoc/calypso_util/index.html")] -#![warn(clippy::pedantic)]