chore: clean up Makefile and update contribution guide (#10602)

* update makefile and instructions

* clean up

Author: zerosnacks

CONTRIBUTING.md

@@ -40,8 +40,8 @@ elsewhere.
 
 If you have reviewed existing documentation and still have questions, or you are having problems, you can get help in the following ways:
 
--   **Asking in the support Telegram:** The [Foundry Support Telegram][support-tg] is a fast and easy way to ask questions.
--   **Opening a discussion:** This repository comes with a discussions board where you can also ask for help. Click the "Discussions" tab at the top.
+- **Asking in the support Telegram:** The [Foundry Support Telegram][support-tg] is a fast and easy way to ask questions.
+- **Opening a discussion:** This repository comes with a discussions board where you can also ask for help. Click the "Discussions" tab at the top.
 
 As Foundry is still in heavy development, the documentation can be a bit scattered.
 The [Foundry Book][foundry-book] is our current best-effort attempt at keeping up-to-date information.
@@ -54,10 +54,10 @@ If you believe that you have uncovered a bug, please fill out the form to the be
 
 The most important pieces of information we need in a bug report are:
 
--   The Foundry version you are on (and that it is up to date)
--   The platform you are on (Windows, macOS, an M1 Mac or Linux)
--   Code snippets if this is happening in relation to testing or building code
--   Concrete steps to reproduce the bug
+- The Foundry version you are on (and that it is up to date)
+- The platform you are on (Windows, macOS or Linux)
+- Code snippets if this is happening in relation to testing or building code
+- Concrete steps to reproduce the bug
 
 In order to rule out the possibility of the bug being in your project, the code snippets should be as minimal
 as possible. It is better if you can reproduce the bug with a small snippet as opposed to an entire project!
@@ -86,7 +86,14 @@ Please also make sure that the following commands pass if you have changed the c
 cargo check --all
 cargo test --all --all-features
 cargo +nightly fmt -- --check
-cargo +nightly clippy --all --all-targets --all-features -- -D warnings
+cargo +nightly clippy --all --all-targets --all-features -- -D warning
+```
+
+or alternatively:
+
+```sh
+make build
+make pr
 ```
 
 If you are working in VSCode, we recommend you install the [rust-analyzer](https://rust-analyzer.github.io/) extension, and use the following VSCode user settings:
@@ -103,7 +110,7 @@ If you are working on a larger feature, we encourage you to open up a draft pull
 
 If you would like to test the binaries built from your change, see [foundryup](https://github.com/foundry-rs/foundry/tree/master/foundryup).
 
-If you would like to use a debugger with breakpoints to debug a patch you might be working on, keep in mind we currently strip debug info for faster builds, which is *not* the default. Therefore, to use a debugger, you need to enable it on the workspace [`Cargo.toml`'s `dev` profile](https://github.com/foundry-rs/foundry/tree/master/Cargo.toml#L15-L18).
+If you would like to use a debugger with breakpoints to debug a patch you might be working on, keep in mind we currently strip debug info for faster builds, which is _not_ the default. Therefore, to use a debugger, you need to enable it on the workspace [`Cargo.toml`'s `dev` profile](https://github.com/foundry-rs/foundry/tree/master/Cargo.toml#L15-L18).
 
 #### Adding tests
 
@@ -113,9 +120,9 @@ in the future.
 
 Types of tests include:
 
--   **Unit tests**: Functions which have very specific tasks should be unit tested.
--   **Integration tests**: For general purpose, far reaching functionality, integration tests should be added.
-    The best way to add a new integration test is to look at existing ones and follow the style.
+- **Unit tests**: Functions which have very specific tasks should be unit tested.
+- **Integration tests**: For general purpose, far reaching functionality, integration tests should be added.
+  The best way to add a new integration test is to look at existing ones and follow the style.
 
 Tests that use forking must contain "fork" in their name.
 

Makefile

@@ -73,46 +73,51 @@ docker-build-prepare: ## Prepare the Docker build environment.
 		docker buildx use cross-builder; \
 	fi
 
-##@ Other
+##@ Test
 
-.PHONY: clean
-clean: ## Clean the project.
-	cargo clean
+.PHONY: test-unit
+test-unit: ## Run unit tests.
+	cargo nextest run -E 'kind(test) & !test(/\b(issue|ext_integration)/)'
+
+.PHONY: test-doc
+test-doc: ## Run doc tests.
+	cargo test --doc --workspace
+
+.PHONY: test
+test: ## Run all tests.
+	make test-unit && \
+	make test-doc
 
-## Linting
+##@ Linting
 
 fmt: ## Run all formatters.
 	cargo +nightly fmt
 	./.github/scripts/format.sh --check
 
-lint-foundry:
-	RUSTFLAGS="-Dwarnings" cargo +nightly clippy --workspace --all-targets --all-features
-
-lint-codespell: ensure-codespell
-	codespell --skip "*.json"
+lint-clippy: ## Run clippy on the codebase.
+	cargo +nightly clippy \
+	--workspace \
+	--all-targets \
+	--all-features \
+	-- -D warnings
 
-ensure-codespell:
-	@if ! command -v codespell &> /dev/null; then \
-		echo "codespell not found. Please install it by running the command `pip install codespell` or refer to the following link for more information: https://github.com/codespell-project/codespell" \
+lint-codespell: ## Run codespell on the codebase.
+	@command -v codespell >/dev/null || { \
+		echo "codespell not found. Please install it by running the command `pipx install codespell` or refer to the following link for more information: https://github.com/codespell-project/codespell" \
 		exit 1; \
-    fi
+	}
+	codespell --skip "*.json"
 
 lint: ## Run all linters.
 	make fmt && \
-	make lint-foundry && \
+	make lint-clippy && \
 	make lint-codespell
 
-## Testing
-
-test-foundry:
-	cargo nextest run -E 'kind(test) & !test(/\b(issue|ext_integration)/)'
-
-test-doc:
-	cargo test --doc --workspace
+##@ Other
 
-test: ## Run all tests.
-	make test-foundry && \
-	make test-doc
+.PHONY: clean
+clean: ## Clean the project.
+	cargo clean
 
 pr: ## Run all tests and linters in preparation for a PR.
 	make lint && \