chore: reconfigure project

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = tab
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = false

.githooks/.gitignore

@@ -0,0 +1,4 @@
+*
+
+!.git*
+!pre-commit

.githooks/pre-commit

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+for FILE in `git diff --cached --name-only`; do
+	if [ -f $FILE ]; then
+		case $FILE in
+			*.rs)
+				rustfmt --unstable-features --skip-children $FILE ;;
+		esac
+		perl -pi -e 'chomp if eof' $FILE
+		git add $FILE
+	fi
+done

.gitignore

@@ -3,4 +3,5 @@ Cargo.lock
 .*
 
 !.git*
-!.vscode
+!.vscode
+!.editorconfig

.vscode/settings.json

@@ -1,7 +1,11 @@
 {
-  "editor.formatOnSave": true,
-  "files.removeFinalNewlines": true,
-  "rust-analyzer.diagnostics.disabled": [
-    "macro-error"
-  ],
+	"editor.formatOnSave": true,
+	"files.removeFinalNewlines": true,
+	"rust-analyzer.imports.granularity.enforce": true,
+	"rust-analyzer.imports.granularity.group": "module",
+	"rust-analyzer.imports.group.enable": false,
+	"rust-analyzer.imports.prefix": "crate",
+	"trailing-spaces.includeEmptyLines": false,
+	"editor.renderWhitespace": "all",
+	"git.ignoreLimitWarning": true
 }

Cargo.toml

@@ -9,15 +9,12 @@ repository = "https://github.com/yuhr/fncmd"
 categories = ["command-line-interface"]
 keywords = ["cli", "macro", "clap"]
 edition = "2021"
-exclude = [".*", "rust-toolchain", "rustfmt.toml", "release.toml", "justfile"]
+exclude = [".*", "rust-toolchain", "*.toml", "justfile"]
 
 [dependencies]
 clap = { version = "3.0.7", features = ["derive"] }
 fncmd-impl = { path = "impl", version = "=1.2.5" }
 once_cell = "1.9.0"
 
 [workspace]
-members = ["impl"]
-
-[dev-dependencies]
-git_hooks = "0.1.3"
+members = ["impl"]

README.md

@@ -20,19 +20,12 @@ This concept is tremendously inspired by [`argopt`](https://crates.io/crates/arg
 
 **This crate is nightly-only**. Make sure you have set up your toolchain as nightly before using (e.g. having [`rust-toolchain`](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) file). You might be interested in [Why nightly](#why-nightly).
 
-To install, if you use [`cargo-edit`](https://crates.io/crates/cargo-edit):
+To install, run:
 
 ```sh
 cargo add fncmd
 ```
 
-Or you can manually edit `Cargo.toml`:
-
-```toml
-[dependencies]
-fncmd = "1.2.5"
-```
-
 ## Basics
 
 This crate exposes just a single attribute macro, [`fncmd`], which can **only** be attached to the `main` function:
@@ -177,7 +170,7 @@ pub async fn main(hello: String) -> anyhow::Result<()> {
 }
 ```
 
-This is because ~~Rust requires procedural macros to produce legal code *for each* macroexpansion~~Sorry this is wrong, it's not Rust but the macros like `#[tokio::main]` *do* some assertions on their own, so we need to feed them a well-mannered version of `main` function, e.g. removing parameters.
+This is because the macros like `#[tokio::main]` do some assertions on their own, so we need to feed them a well-mannered version of `main` function, e.g. removing parameters.
 
 Position of the doc comment doesn't matter.
 

clippy.toml

@@ -0,0 +1,3 @@
+module_inception = false
+collapsible_else_if = false
+write_with_newline = false

impl/src/lib.rs

@@ -40,11 +40,7 @@ pub fn fncmd(attr: TokenStream, item: TokenStream) -> TokenStream {
 		.targets
 		.iter()
 		.filter_map(|target| {
-			target
-				.kind
-				.iter()
-				.any(|k| k == "bin" || k == "example")
-				.then(|| target)
+			target.kind.iter().any(|k| k == "bin" || k == "example").then(|| target)
 		})
 		.collect::<Vec<_>>();
 	let self_version = package.version.to_string();

impl/src/models/fncmd.rs

@@ -73,9 +73,7 @@ impl Fncmd {
 }
 
 impl From<Fncmd> for proc_macro::TokenStream {
-	fn from(from: Fncmd) -> proc_macro::TokenStream {
-		quote!(#from).into()
-	}
+	fn from(from: Fncmd) -> proc_macro::TokenStream { quote!(#from).into() }
 }
 
 impl ToTokens for Fncmd {

impl/src/models/fncmd_arg.rs

@@ -24,12 +24,7 @@ impl FncmdArg {
 		let mut attrs = Vec::new();
 
 		for attr in arg.attrs.iter() {
-			match attr
-				.path
-				.get_ident()
-				.map(|ident| ident.to_string())
-				.as_deref()
-			{
+			match attr.path.get_ident().map(|ident| ident.to_string()).as_deref() {
 				Some("doc") => {
 					doc = Some(quote! { #attr });
 				}
@@ -73,23 +68,14 @@ impl FncmdArg {
 				mutability: pat_ident.mutability,
 			}
 		} else {
-			abort!(
-				pat.span(),
-				"pattern types other than a simple `Ident` are not supported yet"
-			);
+			abort!(pat.span(), "pattern types other than a simple `Ident` are not supported yet");
 		}
 	}
 }
 
 impl ToTokens for FncmdArg {
 	fn to_tokens(&self, tokens: &mut TokenStream) {
-		let Self {
-			name,
-			documentation,
-			attributes,
-			ty,
-			..
-		} = self;
+		let Self { name, documentation, attributes, ty, .. } = self;
 		quote! {
 			#documentation
 			#(#attributes)*

impl/src/models/fncmd_subcmds.rs

@@ -10,27 +10,20 @@ impl FncmdSubcmds {
 
 		// Remove all subcommands that are prefixed with any other target
 		let table = self.0.clone();
-		self.0
-			.retain(|name, _| !table.iter().any(|(other, _)| is_subcommand(name, other)));
+		self.0.retain(|name, _| !table.iter().any(|(other, _)| is_subcommand(name, other)));
 
 		// Remove all non-`pub` targets
 		self.0.retain(|_, (is_pub, _)| *is_pub);
 
 		self
 	}
 
-	pub fn iter(&self) -> impl Iterator<Item = (&String, &(bool, PathBuf))> {
-		self.0.iter()
-	}
+	pub fn iter(&self) -> impl Iterator<Item = (&String, &(bool, PathBuf))> { self.0.iter() }
 }
 
 /// Check if `it` is a subcommand of `of`.
-fn is_subcommand(it: &str, of: &str) -> bool {
-	it.len() > of.len() && it.starts_with(of)
-}
+fn is_subcommand(it: &str, of: &str) -> bool { it.len() > of.len() && it.starts_with(of) }
 
 impl From<HashMap<String, (bool, PathBuf)>> for FncmdSubcmds {
-	fn from(from: HashMap<String, (bool, PathBuf)>) -> Self {
-		FncmdSubcmds(from)
-	}
+	fn from(from: HashMap<String, (bool, PathBuf)>) -> Self { FncmdSubcmds(from) }
 }

impl/src/models/fncmd_visitor.rs

@@ -6,11 +6,7 @@ pub struct FncmdVisitor<'ast> {
 }
 
 impl FncmdVisitor<'_> {
-	pub fn new() -> Self {
-		Self {
-			functions: Vec::new(),
-		}
-	}
+	pub fn new() -> Self { Self { functions: Vec::new() } }
 }
 
 impl<'ast> Visit<'ast> for FncmdVisitor<'ast> {

justfile

@@ -1,6 +1,10 @@
 @_:
 	just --list
 
+setup:
+	chmod +x .githooks/*
+	git config --local core.hooksPath .githooks
+
 bump *ARGS:
 	cargo release --workspace --sign-commit --no-tag --no-push --no-publish {{ARGS}}
 

release.toml

@@ -1,5 +1,4 @@
 pre-release-replacements = [
-	{ file = "README.md", search = "fncmd = \".+\"", replace = "{{crate_name}} = \"{{version}}\"" },
 	{ file = "Cargo.toml", search = "fncmd-impl = \\{ path = \"impl\", version = \"=.+\"\\}", replace = "fncmd-impl = { path = \"impl\", version = \"={{version}}\" }" },
 ]
 pre-release-commit-message = "chore: bump version to {{version}}"

rustfmt.toml

@@ -1,2 +1,12 @@
+brace_style = "PreferSameLine"
+control_brace_style = "AlwaysSameLine"
+fn_single_line = true
 hard_tabs = true
-newline_style = "Unix"
+match_arm_blocks = false
+max_width = 100
+newline_style = "Unix"
+overflow_delimited_expr = true
+trim_final_newlines = "Always"
+use_field_init_shorthand = true
+use_small_heuristics = "Max"
+where_single_line = true

src/exit_code.rs

@@ -7,13 +7,9 @@ pub trait IntoExitCode {
 }
 
 impl<T: std::process::Termination> IntoExitCode for T {
-	fn into_exit_code(self) -> ExitCode {
-		ExitCode(self.report())
-	}
+	fn into_exit_code(self) -> ExitCode { ExitCode(self.report()) }
 }
 
 impl std::process::Termination for ExitCode {
-	fn report(self) -> std::process::ExitCode {
-		self.0
-	}
+	fn report(self) -> std::process::ExitCode { self.0 }
 }

taplo.toml

@@ -0,0 +1,2 @@
+[formatting]
+trailing_newline = false