From 05210b9510b797f7738d5b2d51e8a6877f2d5283 Mon Sep 17 00:00:00 2001 From: Matan Kushner Date: Fri, 4 Oct 2019 22:30:46 +0900 Subject: [PATCH] refactor: Go from Rust workspaces to a package with nested packages (#480) --- Cargo.toml | 60 +++++++++++++++++-- {starship/src => src}/config.rs | 0 {starship/src => src}/configs/aws.rs | 0 {starship/src => src}/configs/battery.rs | 0 {starship/src => src}/configs/character.rs | 0 {starship/src => src}/configs/dotnet.rs | 0 {starship/src => src}/configs/mod.rs | 0 {starship/src => src}/configs/rust.rs | 0 {starship/src => src}/context.rs | 0 {starship/src => src}/init/mod.rs | 0 {starship/src => src}/init/starship.bash | 0 {starship/src => src}/init/starship.fish | 0 {starship/src => src}/init/starship.zsh | 0 {starship/src => src}/lib.rs | 0 {starship/src => src}/main.rs | 0 {starship/src => src}/module.rs | 0 {starship/src => src}/modules/aws.rs | 0 {starship/src => src}/modules/battery.rs | 0 {starship/src => src}/modules/character.rs | 0 {starship/src => src}/modules/cmd_duration.rs | 0 {starship/src => src}/modules/directory.rs | 0 {starship/src => src}/modules/dotnet.rs | 0 {starship/src => src}/modules/env_var.rs | 0 {starship/src => src}/modules/git_branch.rs | 0 {starship/src => src}/modules/git_state.rs | 0 {starship/src => src}/modules/git_status.rs | 0 {starship/src => src}/modules/golang.rs | 0 {starship/src => src}/modules/hostname.rs | 0 {starship/src => src}/modules/java.rs | 0 {starship/src => src}/modules/jobs.rs | 0 {starship/src => src}/modules/kubernetes.rs | 0 {starship/src => src}/modules/line_break.rs | 0 {starship/src => src}/modules/memory_usage.rs | 0 {starship/src => src}/modules/mod.rs | 0 {starship/src => src}/modules/nix_shell.rs | 0 {starship/src => src}/modules/nodejs.rs | 0 {starship/src => src}/modules/package.rs | 0 {starship/src => src}/modules/python.rs | 0 {starship/src => src}/modules/ruby.rs | 0 {starship/src => src}/modules/rust.rs | 0 {starship/src => src}/modules/time.rs | 0 {starship/src => src}/modules/username.rs | 0 {starship/src => src}/print.rs | 0 {starship/src => src}/segment.rs | 0 {starship/src => src}/utils.rs | 0 starship/Cargo.toml | 55 ----------------- starship_module_config_derive/README.md | 1 + 47 files changed, 56 insertions(+), 60 deletions(-) rename {starship/src => src}/config.rs (100%) rename {starship/src => src}/configs/aws.rs (100%) rename {starship/src => src}/configs/battery.rs (100%) rename {starship/src => src}/configs/character.rs (100%) rename {starship/src => src}/configs/dotnet.rs (100%) rename {starship/src => src}/configs/mod.rs (100%) rename {starship/src => src}/configs/rust.rs (100%) rename {starship/src => src}/context.rs (100%) rename {starship/src => src}/init/mod.rs (100%) rename {starship/src => src}/init/starship.bash (100%) rename {starship/src => src}/init/starship.fish (100%) rename {starship/src => src}/init/starship.zsh (100%) rename {starship/src => src}/lib.rs (100%) rename {starship/src => src}/main.rs (100%) rename {starship/src => src}/module.rs (100%) rename {starship/src => src}/modules/aws.rs (100%) rename {starship/src => src}/modules/battery.rs (100%) rename {starship/src => src}/modules/character.rs (100%) rename {starship/src => src}/modules/cmd_duration.rs (100%) rename {starship/src => src}/modules/directory.rs (100%) rename {starship/src => src}/modules/dotnet.rs (100%) rename {starship/src => src}/modules/env_var.rs (100%) rename {starship/src => src}/modules/git_branch.rs (100%) rename {starship/src => src}/modules/git_state.rs (100%) rename {starship/src => src}/modules/git_status.rs (100%) rename {starship/src => src}/modules/golang.rs (100%) rename {starship/src => src}/modules/hostname.rs (100%) rename {starship/src => src}/modules/java.rs (100%) rename {starship/src => src}/modules/jobs.rs (100%) rename {starship/src => src}/modules/kubernetes.rs (100%) rename {starship/src => src}/modules/line_break.rs (100%) rename {starship/src => src}/modules/memory_usage.rs (100%) rename {starship/src => src}/modules/mod.rs (100%) rename {starship/src => src}/modules/nix_shell.rs (100%) rename {starship/src => src}/modules/nodejs.rs (100%) rename {starship/src => src}/modules/package.rs (100%) rename {starship/src => src}/modules/python.rs (100%) rename {starship/src => src}/modules/ruby.rs (100%) rename {starship/src => src}/modules/rust.rs (100%) rename {starship/src => src}/modules/time.rs (100%) rename {starship/src => src}/modules/username.rs (100%) rename {starship/src => src}/print.rs (100%) rename {starship/src => src}/segment.rs (100%) rename {starship/src => src}/utils.rs (100%) delete mode 100644 starship/Cargo.toml create mode 100644 starship_module_config_derive/README.md diff --git a/Cargo.toml b/Cargo.toml index ae1513e0..47f06515 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 "] +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 similarity index 100% rename from starship/src/config.rs rename to src/config.rs diff --git a/starship/src/configs/aws.rs b/src/configs/aws.rs similarity index 100% rename from starship/src/configs/aws.rs rename to src/configs/aws.rs diff --git a/starship/src/configs/battery.rs b/src/configs/battery.rs similarity index 100% rename from starship/src/configs/battery.rs rename to src/configs/battery.rs diff --git a/starship/src/configs/character.rs b/src/configs/character.rs similarity index 100% rename from starship/src/configs/character.rs rename to src/configs/character.rs diff --git a/starship/src/configs/dotnet.rs b/src/configs/dotnet.rs similarity index 100% rename from starship/src/configs/dotnet.rs rename to src/configs/dotnet.rs diff --git a/starship/src/configs/mod.rs b/src/configs/mod.rs similarity index 100% rename from starship/src/configs/mod.rs rename to src/configs/mod.rs diff --git a/starship/src/configs/rust.rs b/src/configs/rust.rs similarity index 100% rename from starship/src/configs/rust.rs rename to src/configs/rust.rs diff --git a/starship/src/context.rs b/src/context.rs similarity index 100% rename from starship/src/context.rs rename to src/context.rs diff --git a/starship/src/init/mod.rs b/src/init/mod.rs similarity index 100% rename from starship/src/init/mod.rs rename to src/init/mod.rs diff --git a/starship/src/init/starship.bash b/src/init/starship.bash similarity index 100% rename from starship/src/init/starship.bash rename to src/init/starship.bash diff --git a/starship/src/init/starship.fish b/src/init/starship.fish similarity index 100% rename from starship/src/init/starship.fish rename to src/init/starship.fish diff --git a/starship/src/init/starship.zsh b/src/init/starship.zsh similarity index 100% rename from starship/src/init/starship.zsh rename to src/init/starship.zsh diff --git a/starship/src/lib.rs b/src/lib.rs similarity index 100% rename from starship/src/lib.rs rename to src/lib.rs diff --git a/starship/src/main.rs b/src/main.rs similarity index 100% rename from starship/src/main.rs rename to src/main.rs diff --git a/starship/src/module.rs b/src/module.rs similarity index 100% rename from starship/src/module.rs rename to src/module.rs diff --git a/starship/src/modules/aws.rs b/src/modules/aws.rs similarity index 100% rename from starship/src/modules/aws.rs rename to src/modules/aws.rs diff --git a/starship/src/modules/battery.rs b/src/modules/battery.rs similarity index 100% rename from starship/src/modules/battery.rs rename to src/modules/battery.rs diff --git a/starship/src/modules/character.rs b/src/modules/character.rs similarity index 100% rename from starship/src/modules/character.rs rename to src/modules/character.rs diff --git a/starship/src/modules/cmd_duration.rs b/src/modules/cmd_duration.rs similarity index 100% rename from starship/src/modules/cmd_duration.rs rename to src/modules/cmd_duration.rs diff --git a/starship/src/modules/directory.rs b/src/modules/directory.rs similarity index 100% rename from starship/src/modules/directory.rs rename to src/modules/directory.rs diff --git a/starship/src/modules/dotnet.rs b/src/modules/dotnet.rs similarity index 100% rename from starship/src/modules/dotnet.rs rename to src/modules/dotnet.rs diff --git a/starship/src/modules/env_var.rs b/src/modules/env_var.rs similarity index 100% rename from starship/src/modules/env_var.rs rename to src/modules/env_var.rs diff --git a/starship/src/modules/git_branch.rs b/src/modules/git_branch.rs similarity index 100% rename from starship/src/modules/git_branch.rs rename to src/modules/git_branch.rs diff --git a/starship/src/modules/git_state.rs b/src/modules/git_state.rs similarity index 100% rename from starship/src/modules/git_state.rs rename to src/modules/git_state.rs diff --git a/starship/src/modules/git_status.rs b/src/modules/git_status.rs similarity index 100% rename from starship/src/modules/git_status.rs rename to src/modules/git_status.rs diff --git a/starship/src/modules/golang.rs b/src/modules/golang.rs similarity index 100% rename from starship/src/modules/golang.rs rename to src/modules/golang.rs diff --git a/starship/src/modules/hostname.rs b/src/modules/hostname.rs similarity index 100% rename from starship/src/modules/hostname.rs rename to src/modules/hostname.rs diff --git a/starship/src/modules/java.rs b/src/modules/java.rs similarity index 100% rename from starship/src/modules/java.rs rename to src/modules/java.rs diff --git a/starship/src/modules/jobs.rs b/src/modules/jobs.rs similarity index 100% rename from starship/src/modules/jobs.rs rename to src/modules/jobs.rs diff --git a/starship/src/modules/kubernetes.rs b/src/modules/kubernetes.rs similarity index 100% rename from starship/src/modules/kubernetes.rs rename to src/modules/kubernetes.rs diff --git a/starship/src/modules/line_break.rs b/src/modules/line_break.rs similarity index 100% rename from starship/src/modules/line_break.rs rename to src/modules/line_break.rs diff --git a/starship/src/modules/memory_usage.rs b/src/modules/memory_usage.rs similarity index 100% rename from starship/src/modules/memory_usage.rs rename to src/modules/memory_usage.rs diff --git a/starship/src/modules/mod.rs b/src/modules/mod.rs similarity index 100% rename from starship/src/modules/mod.rs rename to src/modules/mod.rs diff --git a/starship/src/modules/nix_shell.rs b/src/modules/nix_shell.rs similarity index 100% rename from starship/src/modules/nix_shell.rs rename to src/modules/nix_shell.rs diff --git a/starship/src/modules/nodejs.rs b/src/modules/nodejs.rs similarity index 100% rename from starship/src/modules/nodejs.rs rename to src/modules/nodejs.rs diff --git a/starship/src/modules/package.rs b/src/modules/package.rs similarity index 100% rename from starship/src/modules/package.rs rename to src/modules/package.rs diff --git a/starship/src/modules/python.rs b/src/modules/python.rs similarity index 100% rename from starship/src/modules/python.rs rename to src/modules/python.rs diff --git a/starship/src/modules/ruby.rs b/src/modules/ruby.rs similarity index 100% rename from starship/src/modules/ruby.rs rename to src/modules/ruby.rs diff --git a/starship/src/modules/rust.rs b/src/modules/rust.rs similarity index 100% rename from starship/src/modules/rust.rs rename to src/modules/rust.rs diff --git a/starship/src/modules/time.rs b/src/modules/time.rs similarity index 100% rename from starship/src/modules/time.rs rename to src/modules/time.rs diff --git a/starship/src/modules/username.rs b/src/modules/username.rs similarity index 100% rename from starship/src/modules/username.rs rename to src/modules/username.rs diff --git a/starship/src/print.rs b/src/print.rs similarity index 100% rename from starship/src/print.rs rename to src/print.rs diff --git a/starship/src/segment.rs b/src/segment.rs similarity index 100% rename from starship/src/segment.rs rename to src/segment.rs diff --git a/starship/src/utils.rs b/src/utils.rs similarity index 100% rename from starship/src/utils.rs rename to src/utils.rs diff --git a/starship/Cargo.toml b/starship/Cargo.toml deleted file mode 100644 index 15dba028..00000000 --- a/starship/Cargo.toml +++ /dev/null @@ -1,55 +0,0 @@ -[package] -name = "starship" -version = "0.20.0" -edition = "2018" -authors = ["Matan Kushner "] -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 00000000..b1a0ca9e --- /dev/null +++ b/starship_module_config_derive/README.md @@ -0,0 +1 @@ +# starship_module_config_derive