refactor: Go from Rust workspaces to a package with nested packages (#480)

47 files changed, 56 insertions, 60 deletions

diff --git a/Cargo.toml b/Cargo.toml
index ae1513e06..47f06515e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,55 @@
-[workspace]
-members = [
-    "starship",
-    "starship_module_config_derive",
-]
+[package]
+name = "starship"
+version = "0.20.0"
+edition = "2018"
+authors = ["Matan Kushner <hello@matchai.me>"]
+homepage = "https://starship.rs"
+documentation = "https://starship.rs/guide/"
+repository = "https://github.com/starship/starship"
+readme = "README.md"
+license = "ISC"
+keywords = ["prompt", "shell", "bash", "fish", "zsh"]
+categories = ["command-line-utilities"]
+description = """
+The cross-shell prompt for astronauts. ☄🌌️
+"""
+exclude = ["docs/**/*"]
+
+[badges]
+azure-devops = { project = "starship-control/starship", pipeline = "Starship Test Suite" }
+is-it-maintained-issue-resolution = { repository = "starship/starship" }
+is-it-maintained-open-issues = { repository = "starship/starship" }
+maintenance = { status = "actively-developed" }
+
+[features]
+default = ["battery"]
+
+[dependencies]
+clap = "2.33.0"
+ansi_term = "0.12.1"
+dirs = "2.0.2"
+git2 = { version = "0.10.1", default-features = false, features = [] }
+toml = "0.5.3"
+serde_json = "1.0.41"
+rayon = "1.2.0"
+pretty_env_logger = "0.3.1"
+log = "0.4.8"
+# battery is optional (on by default) because the crate doesn't currently build for Termux
+# see: https://github.com/svartalf/rust-battery/issues/33
+battery = { version = "0.7.4", optional = true }
+path-slash = "0.1.1"
+unicode-segmentation = "1.3.0"
+gethostname = "0.2.0"
+once_cell = "1.2.0"
+chrono = "0.4"
+sysinfo = "0.9.5"
+byte-unit = "3.0.3"
+starship_module_config_derive = { version = "0.1.0", path = "starship_module_config_derive" }
+yaml-rust = "0.4"
+
+[dev-dependencies]
+tempfile = "3.1.0"
+
+[[bin]]
+name = "starship"
+path = "src/main.rs"
diff --git a/starship/src/config.rs b/src/config.rs
index 6f5025179..6f5025179 100644
--- a/starship/src/config.rs
+++ b/src/config.rs
diff --git a/starship/src/configs/aws.rs b/src/configs/aws.rs
index 96ed3cb5b..96ed3cb5b 100644
--- a/starship/src/configs/aws.rs
+++ b/src/configs/aws.rs
diff --git a/starship/src/configs/battery.rs b/src/configs/battery.rs
index e60b95e2f..e60b95e2f 100644
--- a/starship/src/configs/battery.rs
+++ b/src/configs/battery.rs
diff --git a/starship/src/configs/character.rs b/src/configs/character.rs
index 77a509cff..77a509cff 100644
--- a/starship/src/configs/character.rs
+++ b/src/configs/character.rs
diff --git a/starship/src/configs/dotnet.rs b/src/configs/dotnet.rs
index 084798c6d..084798c6d 100644
--- a/starship/src/configs/dotnet.rs
+++ b/src/configs/dotnet.rs
diff --git a/starship/src/configs/mod.rs b/src/configs/mod.rs
index f557345e4..f557345e4 100644
--- a/starship/src/configs/mod.rs
+++ b/src/configs/mod.rs
diff --git a/starship/src/configs/rust.rs b/src/configs/rust.rs
index 2bd257588..2bd257588 100644
--- a/starship/src/configs/rust.rs
+++ b/src/configs/rust.rs
diff --git a/starship/src/context.rs b/src/context.rs
index d440abf02..d440abf02 100644
--- a/starship/src/context.rs
+++ b/src/context.rs
diff --git a/starship/src/init/mod.rs b/src/init/mod.rs
index 85f8f80d7..85f8f80d7 100644
--- a/starship/src/init/mod.rs
+++ b/src/init/mod.rs
diff --git a/starship/src/init/starship.bash b/src/init/starship.bash
index da02f6e42..da02f6e42 100644
--- a/starship/src/init/starship.bash
+++ b/src/init/starship.bash
diff --git a/starship/src/init/starship.fish b/src/init/starship.fish
index b2e88e5ee..b2e88e5ee 100644
--- a/starship/src/init/starship.fish
+++ b/src/init/starship.fish
diff --git a/starship/src/init/starship.zsh b/src/init/starship.zsh
index fdae70e12..fdae70e12 100644
--- a/starship/src/init/starship.zsh
+++ b/src/init/starship.zsh
diff --git a/starship/src/lib.rs b/src/lib.rs
index 08c91ec3a..08c91ec3a 100644
--- a/starship/src/lib.rs
+++ b/src/lib.rs
diff --git a/starship/src/main.rs b/src/main.rs
index 488555d1e..488555d1e 100644
--- a/starship/src/main.rs
+++ b/src/main.rs
diff --git a/starship/src/module.rs b/src/module.rs
index d14814eb0..d14814eb0 100644
--- a/starship/src/module.rs
+++ b/src/module.rs
diff --git a/starship/src/modules/aws.rs b/src/modules/aws.rs
index fb8fabfa7..fb8fabfa7 100644
--- a/starship/src/modules/aws.rs
+++ b/src/modules/aws.rs
diff --git a/starship/src/modules/battery.rs b/src/modules/battery.rs
index e67280297..e67280297 100644
--- a/starship/src/modules/battery.rs
+++ b/src/modules/battery.rs
diff --git a/starship/src/modules/character.rs b/src/modules/character.rs
index 4925147cb..4925147cb 100644
--- a/starship/src/modules/character.rs
+++ b/src/modules/character.rs
diff --git a/starship/src/modules/cmd_duration.rs b/src/modules/cmd_duration.rs
index 8d4816392..8d4816392 100644
--- a/starship/src/modules/cmd_duration.rs
+++ b/src/modules/cmd_duration.rs
diff --git a/starship/src/modules/directory.rs b/src/modules/directory.rs
index fd9e74fd1..fd9e74fd1 100644
--- a/starship/src/modules/directory.rs
+++ b/src/modules/directory.rs
diff --git a/starship/src/modules/dotnet.rs b/src/modules/dotnet.rs
index d63256e56..d63256e56 100644
--- a/starship/src/modules/dotnet.rs
+++ b/src/modules/dotnet.rs
diff --git a/starship/src/modules/env_var.rs b/src/modules/env_var.rs
index bb46456a1..bb46456a1 100644
--- a/starship/src/modules/env_var.rs
+++ b/src/modules/env_var.rs
diff --git a/starship/src/modules/git_branch.rs b/src/modules/git_branch.rs
index 6d07e8905..6d07e8905 100644
--- a/starship/src/modules/git_branch.rs
+++ b/src/modules/git_branch.rs
diff --git a/starship/src/modules/git_state.rs b/src/modules/git_state.rs
index c26a6007b..c26a6007b 100644
--- a/starship/src/modules/git_state.rs
+++ b/src/modules/git_state.rs
diff --git a/starship/src/modules/git_status.rs b/src/modules/git_status.rs
index 9b97a2f24..9b97a2f24 100644
--- a/starship/src/modules/git_status.rs
+++ b/src/modules/git_status.rs
diff --git a/starship/src/modules/golang.rs b/src/modules/golang.rs
index 9bbf0c16b..9bbf0c16b 100644
--- a/starship/src/modules/golang.rs
+++ b/src/modules/golang.rs
diff --git a/starship/src/modules/hostname.rs b/src/modules/hostname.rs
index d71f733fa..d71f733fa 100644
--- a/starship/src/modules/hostname.rs
+++ b/src/modules/hostname.rs
diff --git a/starship/src/modules/java.rs b/src/modules/java.rs
index 9bd9c736f..9bd9c736f 100644
--- a/starship/src/modules/java.rs
+++ b/src/modules/java.rs
diff --git a/starship/src/modules/jobs.rs b/src/modules/jobs.rs
index 8a667049e..8a667049e 100644
--- a/starship/src/modules/jobs.rs
+++ b/src/modules/jobs.rs
diff --git a/starship/src/modules/kubernetes.rs b/src/modules/kubernetes.rs
index 5142c7dd6..5142c7dd6 100644
--- a/starship/src/modules/kubernetes.rs
+++ b/src/modules/kubernetes.rs
diff --git a/starship/src/modules/line_break.rs b/src/modules/line_break.rs
index 259e60877..259e60877 100644
--- a/starship/src/modules/line_break.rs
+++ b/src/modules/line_break.rs
diff --git a/starship/src/modules/memory_usage.rs b/src/modules/memory_usage.rs
index e3b7918c7..e3b7918c7 100644
--- a/starship/src/modules/memory_usage.rs
+++ b/src/modules/memory_usage.rs
diff --git a/starship/src/modules/mod.rs b/src/modules/mod.rs
index 5a0b8ddcb..5a0b8ddcb 100644
--- a/starship/src/modules/mod.rs
+++ b/src/modules/mod.rs
diff --git a/starship/src/modules/nix_shell.rs b/src/modules/nix_shell.rs
index 36228993d..36228993d 100644
--- a/starship/src/modules/nix_shell.rs
+++ b/src/modules/nix_shell.rs
diff --git a/starship/src/modules/nodejs.rs b/src/modules/nodejs.rs
index b30f2f531..b30f2f531 100644
--- a/starship/src/modules/nodejs.rs
+++ b/src/modules/nodejs.rs
diff --git a/starship/src/modules/package.rs b/src/modules/package.rs
index 0debe162d..0debe162d 100644
--- a/starship/src/modules/package.rs
+++ b/src/modules/package.rs
diff --git a/starship/src/modules/python.rs b/src/modules/python.rs
index b871ef808..b871ef808 100644
--- a/starship/src/modules/python.rs
+++ b/src/modules/python.rs
diff --git a/starship/src/modules/ruby.rs b/src/modules/ruby.rs
index 0faa2ccf8..0faa2ccf8 100644
--- a/starship/src/modules/ruby.rs
+++ b/src/modules/ruby.rs
diff --git a/starship/src/modules/rust.rs b/src/modules/rust.rs
index 5120b610b..5120b610b 100644
--- a/starship/src/modules/rust.rs
+++ b/src/modules/rust.rs
diff --git a/starship/src/modules/time.rs b/src/modules/time.rs
index 344c17cfb..344c17cfb 100644
--- a/starship/src/modules/time.rs
+++ b/src/modules/time.rs
diff --git a/starship/src/modules/username.rs b/src/modules/username.rs
index 376da86c8..376da86c8 100644
--- a/starship/src/modules/username.rs
+++ b/src/modules/username.rs
diff --git a/starship/src/print.rs b/src/print.rs
index 591ff32ac..591ff32ac 100644
--- a/starship/src/print.rs
+++ b/src/print.rs
diff --git a/starship/src/segment.rs b/src/segment.rs
index 8c0140ac1..8c0140ac1 100644
--- a/starship/src/segment.rs
+++ b/src/segment.rs
diff --git a/starship/src/utils.rs b/src/utils.rs
index c873f45aa..c873f45aa 100644
--- a/starship/src/utils.rs
+++ b/src/utils.rs
diff --git a/starship/Cargo.toml b/starship/Cargo.toml
deleted file mode 100644
index 15dba028f..000000000
--- a/starship/Cargo.toml
+++ /dev/null
@@ -1,55 +0,0 @@
-[package]
-name = "starship"
-version = "0.20.0"
-edition = "2018"
-authors = ["Matan Kushner <hello@matchai.me>"]
-homepage = "https://starship.rs"
-documentation = "https://starship.rs/guide/"
-repository = "https://github.com/starship/starship"
-readme = "README.md"
-license = "ISC"
-keywords = ["prompt", "shell", "bash", "fish", "zsh"]
-categories = ["command-line-utilities"]
-description = """
-The cross-shell prompt for astronauts. ☄🌌️
-"""
-exclude = ["docs/**/*"]
-
-[badges]
-azure-devops = { project = "starship-control/starship", pipeline = "Starship Test Suite" }
-is-it-maintained-issue-resolution = { repository = "starship/starship" }
-is-it-maintained-open-issues = { repository = "starship/starship" }
-maintenance = { status = "actively-developed" }
-
-[features]
-default = ["battery"]
-
-[dependencies]
-clap = "2.33.0"
-ansi_term = "0.12.1"
-dirs = "2.0.2"
-git2 = { version = "0.10.1", default-features = false, features = [] }
-toml = "0.5.3"
-serde_json = "1.0.41"
-rayon = "1.2.0"
-pretty_env_logger = "0.3.1"
-log = "0.4.8"
-# battery is optional (on by default) because the crate doesn't currently build for Termux
-# see: https://github.com/svartalf/rust-battery/issues/33
-battery = { version = "0.7.4", optional = true }
-path-slash = "0.1.1"
-unicode-segmentation = "1.3.0"
-gethostname = "0.2.0"
-once_cell = "1.2.0"
-chrono = "0.4"
-sysinfo = "0.9.5"
-byte-unit = "3.0.3"
-starship_module_config_derive = { version = "0.1.0", path = "../starship_module_config_derive" }
-yaml-rust = "0.4"
-
-[dev-dependencies]
-tempfile = "3.1.0"
-
-[[bin]]
-name = "starship"
-path = "src/main.rs"
diff --git a/starship_module_config_derive/README.md b/starship_module_config_derive/README.md
new file mode 100644
index 000000000..b1a0ca9ee
--- /dev/null
+++ b/starship_module_config_derive/README.md
@@ -0,0 +1 @@
+# starship_module_config_derive