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

2019-10-04 22:30:46 +09:00 · 2019-10-04 22:30:46 +09:00 · 05210b9510
parent e90a3768da
commit 05210b9510
47 changed files with 56 additions and 60 deletions
--- 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"
--- a/starship/src/config.rs
+++ b/starship/src/config.rs
--- a/starship/src/configs/aws.rs
+++ b/starship/src/configs/aws.rs
--- a/starship/src/configs/battery.rs
+++ b/starship/src/configs/battery.rs
--- a/starship/src/configs/character.rs
+++ b/starship/src/configs/character.rs
--- a/starship/src/configs/dotnet.rs
+++ b/starship/src/configs/dotnet.rs
--- a/starship/src/configs/mod.rs
+++ b/starship/src/configs/mod.rs
--- a/starship/src/configs/rust.rs
+++ b/starship/src/configs/rust.rs
--- a/starship/src/context.rs
+++ b/starship/src/context.rs
--- a/starship/src/init/mod.rs
+++ b/starship/src/init/mod.rs
--- a/starship/src/init/starship.bash
+++ b/starship/src/init/starship.bash
--- a/starship/src/init/starship.fish
+++ b/starship/src/init/starship.fish
--- a/starship/src/init/starship.zsh
+++ b/starship/src/init/starship.zsh
--- a/starship/src/lib.rs
+++ b/starship/src/lib.rs
--- a/starship/src/main.rs
+++ b/starship/src/main.rs
--- a/starship/src/module.rs
+++ b/starship/src/module.rs
--- a/starship/src/modules/aws.rs
+++ b/starship/src/modules/aws.rs
--- a/starship/src/modules/battery.rs
+++ b/starship/src/modules/battery.rs
--- a/starship/src/modules/character.rs
+++ b/starship/src/modules/character.rs
--- a/starship/src/modules/cmd_duration.rs
+++ b/starship/src/modules/cmd_duration.rs
--- a/starship/src/modules/directory.rs
+++ b/starship/src/modules/directory.rs
--- a/starship/src/modules/dotnet.rs
+++ b/starship/src/modules/dotnet.rs
--- a/starship/src/modules/env_var.rs
+++ b/starship/src/modules/env_var.rs
--- a/starship/src/modules/git_branch.rs
+++ b/starship/src/modules/git_branch.rs
--- a/starship/src/modules/git_state.rs
+++ b/starship/src/modules/git_state.rs
--- a/starship/src/modules/git_status.rs
+++ b/starship/src/modules/git_status.rs
--- a/starship/src/modules/golang.rs
+++ b/starship/src/modules/golang.rs
--- a/starship/src/modules/hostname.rs
+++ b/starship/src/modules/hostname.rs
--- a/starship/src/modules/java.rs
+++ b/starship/src/modules/java.rs
--- a/starship/src/modules/jobs.rs
+++ b/starship/src/modules/jobs.rs
--- a/starship/src/modules/kubernetes.rs
+++ b/starship/src/modules/kubernetes.rs
--- a/starship/src/modules/line_break.rs
+++ b/starship/src/modules/line_break.rs
--- a/starship/src/modules/memory_usage.rs
+++ b/starship/src/modules/memory_usage.rs
--- a/starship/src/modules/mod.rs
+++ b/starship/src/modules/mod.rs
--- a/starship/src/modules/nix_shell.rs
+++ b/starship/src/modules/nix_shell.rs
--- a/starship/src/modules/nodejs.rs
+++ b/starship/src/modules/nodejs.rs
--- a/starship/src/modules/package.rs
+++ b/starship/src/modules/package.rs
--- a/starship/src/modules/python.rs
+++ b/starship/src/modules/python.rs
--- a/starship/src/modules/ruby.rs
+++ b/starship/src/modules/ruby.rs
--- a/starship/src/modules/rust.rs
+++ b/starship/src/modules/rust.rs
--- a/starship/src/modules/time.rs
+++ b/starship/src/modules/time.rs
--- a/starship/src/modules/username.rs
+++ b/starship/src/modules/username.rs
--- a/starship/src/print.rs
+++ b/starship/src/print.rs
--- a/starship/src/segment.rs
+++ b/starship/src/segment.rs
--- a/starship/src/utils.rs
+++ b/starship/src/utils.rs
--- a/starship/Cargo.toml
+++ b/starship/Cargo.toml
@ -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"
--- a/starship_module_config_derive/README.md
+++ b/starship_module_config_derive/README.md
@ -0,0 +1 @@
+# starship_module_config_derive