Merge aargvark and genemichaels repos, add genemichaels indent spaces…

… option

Cargo.toml

@@ -1,12 +1,10 @@
 [workspace]
 resolver = "2"
-members = ["crates/genemichaels", "crates/genemichaels-lib"]
+members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
 license = "ISC"
-repository = "https://github.com/andrewbaxter/genemichaels"
-readme = "readme.md"
 
 [workspace.dependencies]
 syn = { version = "2", features = ["full"] }

crates/aargvark/Cargo.toml

@@ -1,11 +1,30 @@
-[workspace]
-resolver = "2"
-members = ["crates/*"]
-
-[workspace.package]
-edition = "2021"
-license = "ISC"
+[package]
+name = "aargvark"
 description = "Self-similar argument parsing"
-homepage = "https://github.com/andrewbaxter/aargvark"
+version = "0.6.5"
+edition.workspace = true
+license.workspace = true
 repository = "https://github.com/andrewbaxter/aargvark"
-readme = "readme.md"
+readme = "../../readme_aargvark.md"
+
+[package.metadata.docs.rs]
+all-features = true
+
+[features]
+default = []
+serde_json = ["dep:serde_json", "dep:serde"]
+serde_yaml = ["dep:serde_yaml", "dep:serde"]
+http_types = ["dep:http"]
+
+[dependencies]
+aargvark_proc_macros = { path = "../aargvark_proc_macros", version = "=3.2.5" }
+serde_json = { version = "1", optional = true }
+serde_yaml = { version = "0", optional = true }
+convert_case = "0.6"
+comfy-table = { version = "7", features = ["custom_styling"] }
+url = { version = "2", optional = true }
+http = { version = "1", optional = true }
+serde = { version = "1", optional = true }
+console = "0.15"
+textwrap = { version = "0.16", features = ["terminal_size"] }
+unicode-width = "0.1"

crates/aargvark/readme.md

@@ -0,0 +1 @@
+../../readme.md

crates/aargvark/crates/aargvark_proc_macros/Cargo.toml → crates/aargvark_proc_macros/Cargo.toml

@@ -4,17 +4,16 @@ description = "Helper crate for aargvark"
 version = "3.2.5"
 edition.workspace = true
 license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-readme.workspace = true
+repository = "https://github.com/andrewbaxter/aargvark"
+readme = "../../readme_aargvark.md"
 
 [lib]
 proc-macro = true
 
 [dependencies]
 convert_case = "0.6"
 darling = "0.20"
-genemichaels-lib = "0.5"
+genemichaels-lib = "=0.5.4"
 proc-macro2 = "1"
 quote = "1"
 syn = "2"

crates/aargvark/crates/aargvark_tests/Cargo.toml → crates/aargvark_tests/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "aargvark_tests"
 publish = false
+edition.workspace = true
 
 [dependencies]
 aargvark = { path = "../aargvark" }

crates/genemichaels-lib/Cargo.toml

@@ -4,8 +4,8 @@ description = "Makes your code formatty, the library"
 version = "0.5.4"
 edition.workspace = true
 license.workspace = true
-repository.workspace = true
-readme.workspace = true
+repository = "https://github.com/andrewbaxter/genemichaels"
+readme = "../../readme_genemichaels.md"
 
 [dependencies]
 markdown = { version = "=1.0.0-alpha.21" }