Merge branch 'master' into grandizzy/fix-release

Author: grandizzy

crates/evm/core/src/precompiles.rs

@@ -49,7 +49,7 @@ pub const PRECOMPILES: &[Address] = &[
     ODYSSEY_P256_ADDRESS,
 ];
 
-/// [EIP-7212](https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md) secp256r1 precompile address on Odyssey.
+/// [RIP-7212](https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md) secp256r1 precompile address on Odyssey.
 ///
 /// <https://github.com/ithacaxyz/odyssey/blob/482f4547631ae5c64ebea6a4b4ef93184a4abfee/crates/node/src/evm.rs#L35-L35>
 pub const ODYSSEY_P256_ADDRESS: Address = address!("0000000000000000000000000000000000000014");
@@ -68,6 +68,6 @@ pub fn p256_verify(input: &Bytes, gas_limit: u64) -> PrecompileResult {
     })
 }
 
-/// [EIP-7212](https://eips.ethereum.org/EIPS/eip-7212#specification) secp256r1 precompile.
+/// [RIP-7212](https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md) secp256r1 precompile.
 pub const ODYSSEY_P256: PrecompileWithAddress =
     PrecompileWithAddress(ODYSSEY_P256_ADDRESS, Precompile::Standard(p256_verify));

crates/forge/bin/cmd/coverage.rs

@@ -274,7 +274,7 @@ impl CoverageArgs {
 
         let known_contracts = runner.known_contracts.clone();
 
-        let filter = self.test.filter(&config);
+        let filter = self.test.filter(&config)?;
         let outcome = self.test.run_tests(runner, config, verbosity, &filter, output).await?;
 
         outcome.ensure_ok(false)?;

crates/forge/bin/cmd/test/mod.rs

@@ -2,7 +2,7 @@ use super::{install, test::filter::ProjectPathsAwareFilter, watch::WatchArgs};
 use alloy_primitives::U256;
 use chrono::Utc;
 use clap::{Parser, ValueHint};
-use eyre::{Context, OptionExt, Result};
+use eyre::{bail, Context, OptionExt, Result};
 use forge::{
     decode::decode_console_logs,
     gas_report::GasReport,
@@ -300,7 +300,7 @@ impl TestArgs {
         // Set up the project.
         let project = config.project()?;
 
-        let filter = self.filter(&config);
+        let filter = self.filter(&config)?;
         trace!(target: "forge::test", ?filter, "using filter");
 
         let sources_to_compile = self.get_sources_to_compile(&config, &filter)?;
@@ -815,19 +815,19 @@ impl TestArgs {
 
     /// Returns the flattened [`FilterArgs`] arguments merged with [`Config`].
     /// Loads and applies filter from file if only last test run failures performed.
-    pub fn filter(&self, config: &Config) -> ProjectPathsAwareFilter {
+    pub fn filter(&self, config: &Config) -> Result<ProjectPathsAwareFilter> {
         let mut filter = self.filter.clone();
         if self.rerun {
             filter.test_pattern = last_run_failures(config);
         }
         if filter.path_pattern.is_some() {
             if self.path.is_some() {
-                panic!("Can not supply both --match-path and |path|");
+                bail!("Can not supply both --match-path and |path|");
             }
         } else {
             filter.path_pattern = self.path.clone();
         }
-        filter.merge_with_config(config)
+        Ok(filter.merge_with_config(config))
     }
 
     /// Returns whether `BuildArgs` was configured with `--watch`

crates/forge/bin/cmd/watch.rs

@@ -263,7 +263,7 @@ pub async fn watch_gas_snapshot(args: GasSnapshotArgs) -> Result<()> {
 /// test`
 pub async fn watch_test(args: TestArgs) -> Result<()> {
     let config: Config = args.build.load_config()?;
-    let filter = args.filter(&config);
+    let filter = args.filter(&config)?;
     // Marker to check whether to override the command.
     let no_reconfigure = filter.args().test_pattern.is_some() ||
         filter.args().path_pattern.is_some() ||