feat: use virtual workspace

thinkgos · Dec 13, 2023 · 774ae55 · 774ae55
1 parent de838ce
commit 774ae55
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 109 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,18 @@
-[package]
-name = "goup-rs"
+[workspace]
+resolver = "2"
+members = [
+    "goup",
+    "goup-consts",
+    "goup-version",
+    "goup-downloader"
+]
+default-members = ["goup"]
+
+[workspace.package]
 version = "0.2.5"
 authors = ["thinkgo <[email protected]>"]
 edition = "2021"
 rust-version = "1.70.0"
-build = "build.rs"
 description = "goup is an elegant Go version manager"
 keywords = [
     "goup",
@@ -17,42 +25,17 @@ license = "Apache-2.0"
 readme = "README.md"
 homepage = "https://github.com/thinkgos/goup-rs"
 repository = "https://github.com/thinkgos/goup-rs"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "goup"
-path = "src/main.rs"
 
-[build-dependencies]
-version_check = "0.9"
-shadow-rs = "0.25"
-
-[dependencies]
-goup-consts = {path = "./goup-consts", version = "0.2.5"}
-goup-version = {path = "./goup-version", version = "0.2.5"}
-goup-downloader = {path = "./goup-downloader", version = "0.2.5"}
-
-clap = {version = "4.4", features = ["derive", "env"]}
-clap_complete = "4.4"
-anyhow = "1.0"
-which = "5.0"
-prettytable-rs = "0.10"
-dialoguer = "0.11"
-self_update = {version = "0.39", default-features = false, features = ["rustls", "compression-flate2", "compression-zip-deflate"]}
-shadow-rs = "0.25"
+[workspace.lints.rust]
+unsafe_code = "forbid"
+# unused = "allow" # for experimental dev
 
 [profile.dev.package."*"]
-opt-level = 3
+opt-level = "z"
 
 [profile.release]
-lto = true
+opt-level = "z"
 strip = true
+lto = true
 codegen-units = 1
 
-[workspace]
-resolver = "2"
-members = [
-    "goup-consts",
-    "goup-version",
-    "goup-downloader"
-]
diff --git a/README.md b/README.md
@@ -16,6 +16,12 @@ There are a bunch of solutions to install Go or manage Go versions outside of a
 cargo install goup --git https://github.com/thinkgos/goup-rs
 ```
 
+or
+
+```shell
+cargo install goup-rs
+```
+
 ### Manual
 
 If you want to install manually, there are the steps:

diff --git a/goup-consts/Cargo.toml b/goup-consts/Cargo.toml
@@ -1,21 +1,15 @@
 [package]
 name = "goup-consts"
-version = "0.2.5"
-authors = ["thinkgo <[email protected]>"]
-edition = "2021"
-rust-version = "1.70.0"
-description = "goup-consts goup consts"
-keywords = [
-    "goup",
-    "goup",
-    "golang",
-    "version-manager",
-    "tool",
-]
-license = "Apache-2.0"
-readme = "../README.md"
-homepage = "https://github.com/thinkgos/goup-rs"
-repository = "https://github.com/thinkgos/goup-rs"
+version.workspace =true
+authors.workspace =true
+edition.workspace =true
+rust-version.workspace =true
+description.workspace =true
+keywords.workspace =true
+license.workspace =true
+readme.workspace =true
+homepage.workspace =true
+repository.workspace =true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/goup-downloader/Cargo.toml b/goup-downloader/Cargo.toml
@@ -1,26 +1,20 @@
 [package]
 name = "goup-downloader"
-version = "0.2.5"
-authors = ["thinkgo <[email protected]>"]
-edition = "2021"
-rust-version = "1.70.0"
-description = "goup-downloader goup downloader"
-keywords = [
-    "goup",
-    "goup",
-    "golang",
-    "version-manager",
-    "tool",
-]
-license = "Apache-2.0"
-readme = "../README.md"
-homepage = "https://github.com/thinkgos/goup-rs"
-repository = "https://github.com/thinkgos/goup-rs"
+version.workspace =true
+authors.workspace =true
+edition.workspace =true
+rust-version.workspace =true
+description.workspace =true
+keywords.workspace =true
+license.workspace =true
+readme.workspace =true
+homepage.workspace =true
+repository.workspace =true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-goup-consts = {path = "../goup-consts", version = "0.2.5"}
-goup-version = {path = "../goup-version", version = "0.2.5"}
+goup-consts = {path = "../goup-consts"}
+goup-version = {path = "../goup-version"}
 anyhow = "1.0"
 dirs = "5.0"
 regex = "1.10"

diff --git a/goup-version/Cargo.toml b/goup-version/Cargo.toml
@@ -1,26 +1,20 @@
 [package]
 name = "goup-version"
-version = "0.2.5"
-authors = ["thinkgo <[email protected]>"]
-edition = "2021"
-rust-version = "1.70.0"
-description = "goup-version goup version"
-keywords = [
-    "goup",
-    "goup",
-    "golang",
-    "version-manager",
-    "tool",
-]
-license = "Apache-2.0"
-readme = "../README.md"
-homepage = "https://github.com/thinkgos/goup-rs"
-repository = "https://github.com/thinkgos/goup-rs"
+version.workspace =true
+authors.workspace =true
+edition.workspace =true
+rust-version.workspace =true
+description.workspace =true
+keywords.workspace =true
+license.workspace =true
+readme.workspace =true
+homepage.workspace =true
+repository.workspace =true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-goup-consts = {path = "../goup-consts", version = "0.2.5"}
+goup-consts = {path = "../goup-consts"}
 anyhow = "1.0"
 dirs = "5.0"
 regex = "1.10"

diff --git a/goup/Cargo.toml b/goup/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "goup-rs"
+version.workspace =true
+authors.workspace =true
+edition.workspace =true
+rust-version.workspace =true
+description.workspace =true
+keywords.workspace =true
+license.workspace =true
+readme.workspace =true
+homepage.workspace =true
+repository.workspace =true
+
+build = "build.rs"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+name = "goup"
+path = "src/main.rs"
+
+[build-dependencies]
+version_check = "0.9"
+shadow-rs = "0.25"
+
+[dependencies]
+goup-consts = {path = "../goup-consts"}
+goup-version = {path = "../goup-version"}
+goup-downloader = {path = "../goup-downloader"}
+
+clap = {version = "4.4", features = ["derive", "env"]}
+clap_complete = "4.4"
+anyhow = "1.0"
+which = "5.0"
+prettytable-rs = "0.10"
+dialoguer = "0.11"
+self_update = {version = "0.39", default-features = false, features = ["rustls", "compression-flate2", "compression-zip-deflate"]}
+shadow-rs = "0.25"
diff --git a/build.rs → goup/build.rs b/build.rs → goup/build.rs
diff --git a/src/command/completion.rs → goup/src/command/completion.rs b/src/command/completion.rs → goup/src/command/completion.rs
diff --git a/src/command/init.rs → goup/src/command/init.rs b/src/command/init.rs → goup/src/command/init.rs
@@ -3,7 +3,7 @@ use goup_version::Version;
 
 use super::Run;
 
-const SETUP_ENV_UNIX: &str = include_str!("../../setup_env_unix");
+const SETUP_ENV_UNIX: &str = include_str!("../../../setup_env_unix");
 
 #[derive(Args, Debug, PartialEq)]
 pub struct Init;

diff --git a/src/command/install.rs → goup/src/command/install.rs b/src/command/install.rs → goup/src/command/install.rs
diff --git a/src/command/list.rs → goup/src/command/list.rs b/src/command/list.rs → goup/src/command/list.rs
diff --git a/src/command/mod.rs → goup/src/command/mod.rs b/src/command/mod.rs → goup/src/command/mod.rs
@@ -26,7 +26,7 @@ use self::upgrade::Upgrade;
 shadow!(build);
 const VERSION: &str = shadow_rs::formatcp!(
     r#"{}
-author:            {}
+author:          {}
 git_commit:      {}
 git_full_commit: {}
 build_time:      {}

diff --git a/src/command/remove.rs → goup/src/command/remove.rs b/src/command/remove.rs → goup/src/command/remove.rs
diff --git a/src/command/search.rs → goup/src/command/search.rs b/src/command/search.rs → goup/src/command/search.rs
diff --git a/src/command/set.rs → goup/src/command/set.rs b/src/command/set.rs → goup/src/command/set.rs
diff --git a/src/command/upgrade.rs → goup/src/command/upgrade.rs b/src/command/upgrade.rs → goup/src/command/upgrade.rs
diff --git a/src/lib.rs → goup/src/lib.rs b/src/lib.rs → goup/src/lib.rs
diff --git a/src/main.rs → goup/src/main.rs b/src/main.rs → goup/src/main.rs