Skip to content

Commit 94d2dab

Browse files
committed
Rename crates for clarity
1 parent 48746c8 commit 94d2dab

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
members = [
33
"./pikelet",
44
"./pikelet-cli",
5-
"./pikelet-gui",
6-
"./pikelet-ide",
5+
"./pikelet-editor",
6+
"./pikelet-language-server",
77
]

pikelet-cli/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ license = "Apache-2.0"
1515
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1616

1717
[features]
18-
default = ["gui", "ide"]
19-
gui = ["pikelet-gui"]
20-
ide = ["pikelet-ide"]
18+
default = ["editor", "language-server"]
19+
editor = ["pikelet-editor"]
20+
language-server = ["pikelet-language-server"]
2121

2222
[dependencies]
2323
codespan-reporting = "0.9.5"
2424
pikelet = { path = "../pikelet" }
25-
pikelet-gui = { path = "../pikelet-gui", optional = true }
26-
pikelet-ide = { path = "../pikelet-ide", optional = true }
25+
pikelet-editor = { path = "../pikelet-editor", optional = true }
26+
pikelet-language-server = { path = "../pikelet-language-server", optional = true }
2727
pretty = "0.10"
2828
rustyline = "6.2"
2929
structopt = "0.3"

pikelet-cli/src/lib.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ pub enum Options {
99
/// Type check some files (not yet implemented).
1010
#[structopt(name = "check")]
1111
Check,
12-
/// Runs the language server/IDE support (not yet implemented).
13-
#[cfg(feature = "ide")]
14-
#[structopt(name = "ide")]
15-
Ide,
12+
/// Runs the structured editor.
13+
#[cfg(feature = "editor")]
14+
#[structopt(name = "editor")]
15+
Editor,
16+
/// Runs the language server.
17+
#[cfg(feature = "language-server")]
18+
#[structopt(name = "language-server")]
19+
LanguageServer,
1620
/// Runs the REPL/interactive mode.
1721
#[structopt(name = "repl")]
1822
Repl(repl::Options),
19-
/// Runs the GUI mode.
20-
#[cfg(feature = "gui")]
21-
#[structopt(name = "gui")]
22-
Gui,
2323
}
2424

2525
/// Run the CLI with the given options
2626
pub fn run(options: Options) -> Result<(), Box<dyn Error>> {
2727
match options {
2828
Options::Check => Err("not yet implemented".into()),
29-
#[cfg(feature = "ide")]
30-
Options::Ide => pikelet_ide::run(),
31-
Options::Repl(options) => repl::run(options),
32-
#[cfg(feature = "gui")]
33-
Options::Gui => {
34-
pikelet_gui::run();
29+
#[cfg(feature = "editor")]
30+
Options::Editor => {
31+
pikelet_editor::run();
3532
Ok(())
3633
}
34+
#[cfg(feature = "language-server")]
35+
Options::LanguageServer => pikelet_language_server::run(),
36+
Options::Repl(options) => repl::run(options),
3737
}
3838
}

pikelet-gui/Cargo.toml renamed to pikelet-editor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "pikelet-gui"
2+
name = "pikelet-editor"
33
version = "0.1.0"
44
authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>"]
55
edition = "2018"

pikelet-gui/README.md renamed to pikelet-editor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pikelet-gui
1+
# pikelet-editor
22

33
This is intended to provided the basis for a structured programming environment for Pikelet.
44
While the hopes behind this are ambitious, we will need to proceed carefully, taking care to avoid getting trapped down rabbit holes.
File renamed without changes.

pikelet-ide/Cargo.toml renamed to pikelet-language-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "pikelet-ide"
2+
name = "pikelet-language-server"
33
version = "0.1.0"
44
authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>"]
55
edition = "2018"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# pikelet-ide
1+
# pikelet-language-server
22

33
Language server protocol implementation for the Pikelet programming language
File renamed without changes.

0 commit comments

Comments
 (0)