From 163cccd7ee863aa0a7a78824639ea5c64cf99fdc Mon Sep 17 00:00:00 2001 From: Bjerg Date: Wed, 27 Sep 2023 21:09:48 +0200 Subject: [PATCH] chore: fix clippy (#5931) * chore: fix clippy * chore: fix clippy --- crates/anvil/tests/it/traces.rs | 8 +- crates/config/src/inline/conf_parser.rs | 8 +- crates/config/src/inline/natspec.rs | 4 +- crates/config/src/lib.rs | 80 +++++++++---------- crates/config/src/utils.rs | 4 +- crates/doc/src/builder.rs | 2 +- crates/doc/src/parser/mod.rs | 12 +-- .../src/executor/inspector/cheatcodes/mod.rs | 2 +- crates/fmt/src/buffer.rs | 8 +- crates/fmt/tests/formatter.rs | 2 +- crates/forge/bin/cmd/geiger/find.rs | 8 +- crates/forge/bin/cmd/verify/etherscan/mod.rs | 4 +- crates/forge/tests/cli/cmd.rs | 28 +++---- crates/forge/tests/cli/config.rs | 16 ++-- crates/forge/tests/cli/create.rs | 8 +- crates/forge/tests/cli/script.rs | 2 +- crates/forge/tests/cli/test_cmd.rs | 16 ++-- crates/macros/src/fmt/ui.rs | 4 +- crates/test-utils/src/util.rs | 4 +- 19 files changed, 110 insertions(+), 110 deletions(-) diff --git a/crates/anvil/tests/it/traces.rs b/crates/anvil/tests/it/traces.rs index 53c86b926c01..d8c08f15e2fa 100644 --- a/crates/anvil/tests/it/traces.rs +++ b/crates/anvil/tests/it/traces.rs @@ -51,7 +51,7 @@ async fn test_parity_suicide_trace() { let prj = TempProject::dapptools().unwrap(); prj.add_source( "Contract", - r#" + r" pragma solidity 0.8.13; contract Contract { address payable private owner; @@ -62,7 +62,7 @@ contract Contract { selfdestruct(owner); } } -"#, +", ) .unwrap(); @@ -98,7 +98,7 @@ async fn test_transfer_debug_trace_call() { let prj = TempProject::dapptools().unwrap(); prj.add_source( "Contract", - r#" + r" pragma solidity 0.8.13; contract Contract { address payable private owner; @@ -109,7 +109,7 @@ contract Contract { selfdestruct(owner); } } -"#, +", ) .unwrap(); diff --git a/crates/config/src/inline/conf_parser.rs b/crates/config/src/inline/conf_parser.rs index c5e5a9be61f3..7402ce6de0e0 100644 --- a/crates/config/src/inline/conf_parser.rs +++ b/crates/config/src/inline/conf_parser.rs @@ -172,10 +172,10 @@ mod tests { contract: Default::default(), function: Default::default(), line: Default::default(), - docs: r#" + docs: r" forge-config: ciii.invariant.depth = 1 forge-config: default.invariant.depth = 1 - "# + " .into(), }; @@ -190,10 +190,10 @@ mod tests { contract: Default::default(), function: Default::default(), line: Default::default(), - docs: r#" + docs: r" forge-config: ci.invariant.depth = 1 forge-config: default.invariant.depth = 1 - "# + " .into(), }; diff --git a/crates/config/src/inline/natspec.rs b/crates/config/src/inline/natspec.rs index eda0a1fec078..6bb2862de647 100644 --- a/crates/config/src/inline/natspec.rs +++ b/crates/config/src/inline/natspec.rs @@ -209,7 +209,7 @@ mod tests { } fn natspec() -> NatSpec { - let conf = r#" + let conf = r" forge-config: default.fuzz.runs = 600 forge-config: ci.fuzz.runs = 500 ========= SOME NOISY TEXT ============= @@ -219,7 +219,7 @@ mod tests { 醤㭊r􎜕󷾸𶚏 ܖ̹灱녗V*竅􋹲⒪苏贗񾦼=숽ؓ򗋲бݧ󫥛𛲍ʹ園Ьi ======================================= forge-config: default.invariant.runs = 1 - "#; + "; NatSpec { contract: "dir/TestContract.t.sol:FuzzContract".to_string(), diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 9be852fb7826..dda24f05700f 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -2565,20 +2565,20 @@ mod tests { assert_eq!(config.install_lib_dir(), PathBuf::from("lib")); jail.create_file( "foundry.toml", - r#" + r" [profile.default] libs = ['node_modules', 'lib'] - "#, + ", )?; let config = Config::load(); assert_eq!(config.install_lib_dir(), PathBuf::from("lib")); jail.create_file( "foundry.toml", - r#" + r" [profile.default] libs = ['custom', 'node_modules', 'lib'] - "#, + ", )?; let config = Config::load(); assert_eq!(config.install_lib_dir(), PathBuf::from("custom")); @@ -2636,12 +2636,12 @@ mod tests { jail.create_file( "foundry.toml", - r#" + r" [profile.default] libs = ['lib'] [profile.local] libs = ['modules'] - "#, + ", )?; jail.set_env("FOUNDRY_PROFILE", "local"); let config = Config::load(); @@ -2745,10 +2745,10 @@ mod tests { jail.create_file( "remappings.txt", - r#" + r" file-ds-test/=lib/ds-test/ file-other/=lib/other/ - "#, + ", )?; let config = Config::load(); @@ -2796,10 +2796,10 @@ mod tests { jail.create_file( "remappings.txt", - r#" + r" ds-test/=lib/ds-test/ other/=lib/other/ - "#, + ", )?; let config = Config::load(); @@ -3348,10 +3348,10 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [profile.default] remappings = ['nested/=lib/nested/'] - "#, + ", )?; let config = Config::load_with_root(jail.directory()); @@ -3588,7 +3588,7 @@ mod tests { } ); - jail.set_env("FOUNDRY_SRC", r#"other-src"#); + jail.set_env("FOUNDRY_SRC", r"other-src"); let config = Config::load(); assert_eq!( config, @@ -3638,7 +3638,7 @@ mod tests { remappings: default.remappings.clone(), } ); - jail.set_env("FOUNDRY_PROFILE", r#"other"#); + jail.set_env("FOUNDRY_PROFILE", r"other"); let base = Config::figment().extract::().unwrap(); assert_eq!( base, @@ -3660,10 +3660,10 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [fuzz] dictionary_weight = 101 - "#, + ", )?; let _config = Config::load(); Ok(()) @@ -3675,7 +3675,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [fuzz] runs = 1 include_storage = false @@ -3689,7 +3689,7 @@ mod tests { [profile.ci.invariant] runs = 400 - "#, + ", )?; let invariant_default = InvariantConfig::default(); @@ -3735,7 +3735,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [fuzz] runs = 100 @@ -3747,7 +3747,7 @@ mod tests { [profile.ci.invariant] runs = 500 - "#, + ", )?; let config = Config::load(); @@ -3838,7 +3838,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [profile.default] libraries= [ './src/SizeAuctionDiscount.sol:Chainlink:0xffedba5e171c4f15abaaabc86e8bd01f9b54dae5', @@ -3847,7 +3847,7 @@ mod tests { './src/test/ChainlinkTWAP.t.sol:ChainlinkTWAP:0xffedba5e171c4f15abaaabc86e8bd01f9b54dae5', './src/SizeAuctionDiscount.sol:Math:0x902f6cf364b8d9470d5793a9b2b2e86bddd21e0c', ] - "#, + ", )?; let config = Config::load(); @@ -3955,7 +3955,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [profile.default] optimizer = true @@ -3964,7 +3964,7 @@ mod tests { [profile.default.optimizer_details.yulDetails] stackAllocation = true - "#, + ", )?; let mut loaded = Config::load(); clear_warning(&mut loaded); @@ -3996,7 +3996,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [profile.default] [profile.default.model_checker] @@ -4004,7 +4004,7 @@ mod tests { engine = 'chc' targets = [ 'assert', 'outOfBounds' ] timeout = 10000 - "#, + ", )?; let mut loaded = Config::load(); clear_warning(&mut loaded); @@ -4046,7 +4046,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [profile.default] [profile.default.model_checker] @@ -4054,7 +4054,7 @@ mod tests { engine = 'chc' targets = [ 'assert', 'outOfBounds' ] timeout = 10000 - "#, + ", )?; let loaded = Config::load().sanitized(); @@ -4101,12 +4101,12 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [fmt] line_length = 100 tab_width = 2 bracket_spacing = true - "#, + ", )?; let loaded = Config::load().sanitized(); assert_eq!( @@ -4128,11 +4128,11 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [invariant] runs = 512 depth = 10 - "#, + ", )?; let loaded = Config::load().sanitized(); @@ -4150,13 +4150,13 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [fuzz] runs = 100 [invariant] depth = 1 - "#, + ", )?; jail.set_env("FOUNDRY_FMT_LINE_LENGTH", "95"); @@ -4174,14 +4174,14 @@ mod tests { #[test] fn test_parse_with_profile() { - let foundry_str = r#" + let foundry_str = r" [profile.default] src = 'src' out = 'out' libs = ['lib'] # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options - "#; + "; assert_eq!( parse_with_profile::(foundry_str).unwrap().unwrap(), ( @@ -4202,11 +4202,11 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [default] src = 'my-src' out = 'my-out' - "#, + ", )?; let loaded = Config::load().sanitized(); assert_eq!(loaded.src.file_name().unwrap(), "my-src"); @@ -4378,10 +4378,10 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [default] [profile.default.optimizer_details] - "#, + ", )?; let config = Config::load(); diff --git a/crates/config/src/utils.rs b/crates/config/src/utils.rs index 5bb383bdc8a3..4c0263e5b1e7 100644 --- a/crates/config/src/utils.rs +++ b/crates/config/src/utils.rs @@ -287,7 +287,7 @@ mod tests { figment::Jail::expect_with(|jail| { jail.create_file( "foundry.toml", - r#" + r" [foo.baz] libs = ['node_modules', 'lib'] @@ -299,7 +299,7 @@ mod tests { [profile.local] libs = ['node_modules', 'lib'] - "#, + ", )?; let path = Path::new("./foundry.toml"); diff --git a/crates/doc/src/builder.rs b/crates/doc/src/builder.rs index d015c21d379b..ecc9bd3ac14f 100644 --- a/crates/doc/src/builder.rs +++ b/crates/doc/src/builder.rs @@ -255,7 +255,7 @@ impl DocBuilder { }; let readme_path = out_dir_src.join(Self::README); - fs::write(&readme_path, homepage_content)?; + fs::write(readme_path, homepage_content)?; // Write summary and section readmes let mut summary = BufWriter::default(); diff --git a/crates/doc/src/parser/mod.rs b/crates/doc/src/parser/mod.rs index ae1621aa777c..5a57535d5c58 100644 --- a/crates/doc/src/parser/mod.rs +++ b/crates/doc/src/parser/mod.rs @@ -264,11 +264,11 @@ mod tests { #[test] fn multiple_shallow_contracts() { let items = parse_source( - r#" + r" contract A { } contract B { } contract C { } - "#, + ", ); assert_eq!(items.len(), 3); @@ -288,7 +288,7 @@ mod tests { #[test] fn contract_with_children_items() { let items = parse_source( - r#" + r" event TopLevelEvent(); contract Contract { @@ -304,7 +304,7 @@ mod tests { bool localVar; // must be ignored } } - "#, + ", ); assert_eq!(items.len(), 2); @@ -327,11 +327,11 @@ mod tests { #[test] fn contract_with_fallback() { let items = parse_source( - r#" + r" contract Contract { fallback() external payable {} } - "#, + ", ); assert_eq!(items.len(), 1); diff --git a/crates/evm/src/executor/inspector/cheatcodes/mod.rs b/crates/evm/src/executor/inspector/cheatcodes/mod.rs index fdc595a4b6d8..2cc77a4c2720 100644 --- a/crates/evm/src/executor/inspector/cheatcodes/mod.rs +++ b/crates/evm/src/executor/inspector/cheatcodes/mod.rs @@ -708,7 +708,7 @@ impl Inspector for Cheatcodes { from: Some(broadcast.new_origin), to: Some(NameOrAddress::Address(call.contract.to_ethers())), value: Some(call.transfer.value).map(|v| v.to_ethers()), - data: Some(call.input.clone().0).map(ethers::types::Bytes), + data: Some(ethers::types::Bytes(call.input.clone().0)), nonce: Some(account.info.nonce.into()), gas: if is_fixed_gas_limit { Some(call.gas_limit.into()) diff --git a/crates/fmt/src/buffer.rs b/crates/fmt/src/buffer.rs index 6d4c113cb6bc..d1842a2951b0 100644 --- a/crates/fmt/src/buffer.rs +++ b/crates/fmt/src/buffer.rs @@ -415,17 +415,17 @@ mod tests { fn test_preserves_original_content_with_default_settings() -> std::fmt::Result { let contents = [ "simple line", - r#" + r" some multiline - content"#, + content", "// comment", "/* comment */", - r#"mutliline + r"mutliline content // comment1 with comments - /* comment2 */ "#, + /* comment2 */ ", ]; for content in contents.iter() { diff --git a/crates/fmt/tests/formatter.rs b/crates/fmt/tests/formatter.rs index e736edebab87..563147fd222d 100644 --- a/crates/fmt/tests/formatter.rs +++ b/crates/fmt/tests/formatter.rs @@ -36,7 +36,7 @@ fn test_directory(base_name: &str) { let default_config = FormatterConfig { line_length: 80, ..Default::default() }; - let mut config = toml::Value::try_from(&default_config).unwrap(); + let mut config = toml::Value::try_from(default_config).unwrap(); let config_table = config.as_table_mut().unwrap(); let mut lines = source.split('\n').peekable(); let mut line_num = 1; diff --git a/crates/forge/bin/cmd/geiger/find.rs b/crates/forge/bin/cmd/geiger/find.rs index 80a31c395dac..315381b55611 100644 --- a/crates/forge/bin/cmd/geiger/find.rs +++ b/crates/forge/bin/cmd/geiger/find.rs @@ -136,14 +136,14 @@ mod tests { #[test] fn can_find_calls() { - let s = r#" + let s = r" contract A is Test { function do_ffi() public { string[] memory inputs = new string[](1); vm.ffi(inputs); } } - "#; + "; let count = find_cheatcodes_in_string(s).unwrap(); assert_eq!(count.ffi.len(), 1); @@ -152,14 +152,14 @@ mod tests { #[test] fn can_find_call_in_assignment() { - let s = r#" + let s = r" contract A is Test { function do_ffi() public { string[] memory inputs = new string[](1); bytes stuff = vm.ffi(inputs); } } - "#; + "; let count = find_cheatcodes_in_string(s).unwrap(); assert_eq!(count.ffi.len(), 1); diff --git a/crates/forge/bin/cmd/verify/etherscan/mod.rs b/crates/forge/bin/cmd/verify/etherscan/mod.rs index 474aa2636e04..7b57d13dbde5 100644 --- a/crates/forge/bin/cmd/verify/etherscan/mod.rs +++ b/crates/forge/bin/cmd/verify/etherscan/mod.rs @@ -530,10 +530,10 @@ mod tests { let root = temp.path(); let root_path = root.as_os_str().to_str().unwrap(); - let config = r#" + let config = r" [profile.default] cache = false - "#; + "; let toml_file = root.join(Config::FILE_NAME); fs::write(toml_file, config).unwrap(); diff --git a/crates/forge/tests/cli/cmd.rs b/crates/forge/tests/cli/cmd.rs index a45fade65ce2..71d6805c1e79 100644 --- a/crates/forge/tests/cli/cmd.rs +++ b/crates/forge/tests/cli/cmd.rs @@ -498,7 +498,7 @@ forgetest!(can_print_warnings, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "Foo", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity >0.8.9; contract Greeter { @@ -506,7 +506,7 @@ contract Greeter { uint256 x = 1; } } - "#, + ", ) .unwrap(); @@ -678,12 +678,12 @@ forgetest!(can_compile_without_warnings, |prj: TestProject, mut cmd: TestCommand prj.inner() .add_source( "A", - r#" + r" pragma solidity 0.8.10; contract A { function testExample() public {} } - "#, + ", ) .unwrap(); @@ -714,12 +714,12 @@ forgetest!(can_fail_compile_with_warnings, |prj: TestProject, mut cmd: TestComma prj.inner() .add_source( "A", - r#" + r" pragma solidity 0.8.10; contract A { function testExample() public {} } - "#, + ", ) .unwrap(); @@ -1430,11 +1430,11 @@ forgetest_init!(can_use_absolute_imports, |prj: TestProject, mut cmd: TestComman prj.inner() .add_lib( "myDepdendency/src/interfaces/IConfig.sol", - r#" + r" pragma solidity ^0.8.10; interface IConfig {} - "#, + ", ) .unwrap(); @@ -1474,11 +1474,11 @@ forgetest_init!( prj.inner() .add_script( "IMyScript.sol", - r#" + r" pragma solidity ^0.8.10; interface IMyScript {} - "#, + ", ) .unwrap(); @@ -1497,11 +1497,11 @@ forgetest_init!( prj.inner() .add_test( "IMyTest.sol", - r#" + r" pragma solidity ^0.8.10; interface IMyTest {} - "#, + ", ) .unwrap(); @@ -1588,12 +1588,12 @@ forgetest_init!(can_build_skip_glob, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_test( "Foo", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.17; contract TestDemo { function test_run() external {} -}"#, +}", ) .unwrap(); // only builds the single template contract `src/*` even if `*.t.sol` or `.s.sol` is absent diff --git a/crates/forge/tests/cli/config.rs b/crates/forge/tests/cli/config.rs index 763c0d497f7a..40da4c6b9013 100644 --- a/crates/forge/tests/cli/config.rs +++ b/crates/forge/tests/cli/config.rs @@ -325,11 +325,11 @@ forgetest!(can_set_solc_explicitly, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "Foo", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity >0.8.9; contract Greeter {} - "#, + ", ) .unwrap(); @@ -351,11 +351,11 @@ forgetest!(can_use_solc, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "Foo", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.7.0; contract Foo {} - "#, + ", ) .unwrap(); @@ -385,7 +385,7 @@ forgetest!(can_set_yul_optimizer, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "Foo", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.10; contract Foo { @@ -395,7 +395,7 @@ contract Foo { } } } - "#, + ", ) .unwrap(); @@ -602,10 +602,10 @@ forgetest!(config_emit_warnings, |prj: TestProject, mut cmd: TestCommand| { cmd.args(["install", "foundry-rs/forge-std", "--no-commit"]); cmd.assert_non_empty_stdout(); - let faulty_toml = r#"[default] + let faulty_toml = r"[default] src = 'src' out = 'out' - libs = ['lib']"#; + libs = ['lib']"; fs::write(prj.root().join("foundry.toml"), faulty_toml).unwrap(); fs::write(prj.root().join("lib").join("forge-std").join("foundry.toml"), faulty_toml).unwrap(); diff --git a/crates/forge/tests/cli/create.rs b/crates/forge/tests/cli/create.rs index 4f2d67ff58d4..acdbc06eb5a1 100644 --- a/crates/forge/tests/cli/create.rs +++ b/crates/forge/tests/cli/create.rs @@ -51,14 +51,14 @@ contract LinkTest { prj.inner() .add_lib( "remapping/MyLib", - r#" + r" // SPDX-License-Identifier: MIT library MyLib { function foobar(uint256 a) public view returns (uint256) { return a * 100; } } -"#, +", ) .unwrap(); @@ -94,7 +94,7 @@ contract Contract { prj.inner() .add_source( "libraries/ChainlinkTWAP", - r#" + r" // SPDX-License-Identifier: MIT pragma solidity ^0.8.13; @@ -103,7 +103,7 @@ library ChainlinkTWAP { return 0; } } -"#, +", ) .unwrap(); diff --git a/crates/forge/tests/cli/script.rs b/crates/forge/tests/cli/script.rs index 2797f8b22b82..0cd73f95b879 100644 --- a/crates/forge/tests/cli/script.rs +++ b/crates/forge/tests/cli/script.rs @@ -737,7 +737,7 @@ forgetest_async!( // Check sensitive logs // Ignore port number since it can change inbetween runs - let re = Regex::new(r#":[0-9]+"#).unwrap(); + let re = Regex::new(r":[0-9]+").unwrap(); let fixtures_log = std::fs::read_to_string( PathBuf::from(env!("CARGO_MANIFEST_DIR")) diff --git a/crates/forge/tests/cli/test_cmd.rs b/crates/forge/tests/cli/test_cmd.rs index 7cf7da5216dd..79c37007ec42 100644 --- a/crates/forge/tests/cli/test_cmd.rs +++ b/crates/forge/tests/cli/test_cmd.rs @@ -39,12 +39,12 @@ forgetest!(warn_no_tests, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "dummy", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity =0.8.13; contract Dummy {} -"#, +", ) .unwrap(); // set up command @@ -61,12 +61,12 @@ forgetest!(warn_no_tests_match, |prj: TestProject, mut cmd: TestCommand| { prj.inner() .add_source( "dummy", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity =0.8.13; contract Dummy {} -"#, +", ) .unwrap(); @@ -87,7 +87,7 @@ forgetest!(suggest_when_no_tests_match, |prj: TestProject, mut cmd: TestCommand| prj.inner() .add_source( "TestE.t.sol", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.10; @@ -95,7 +95,7 @@ contract TestC { function test1() public { } } - "#, + ", ) .unwrap(); @@ -313,7 +313,7 @@ forgetest_init!(can_use_libs_in_multi_fork, |prj: TestProject, mut cmd: TestComm prj.inner() .add_source( "Contract.sol", - r#" + r" // SPDX-License-Identifier: UNLICENSED pragma solidity =0.8.13; @@ -330,7 +330,7 @@ contract Contract { c = Library.f(1, 2); } } - "#, + ", ) .unwrap(); diff --git a/crates/macros/src/fmt/ui.rs b/crates/macros/src/fmt/ui.rs index d6d9971a30db..84b14b259436 100644 --- a/crates/macros/src/fmt/ui.rs +++ b/crates/macros/src/fmt/ui.rs @@ -449,7 +449,7 @@ mod tests { let tx: Transaction = serde_json::from_str(s).unwrap(); assert_eq!(tx.pretty().trim(), - r#" + r" blockHash 0x02b853cf50bc1c335b70790f93d5a390a35a166bea9c895e685cc866e4961cae blockNumber 436 from 0x3b179DcfC5fAa677044c27dCe958e4BC0ad696A6 @@ -472,7 +472,7 @@ queueIndex null queueOrigin sequencer rawTransaction 0xf86681a28084011cbbdc944a16a42407aa491564643e1dfc1fd50af29794ef8084d294f09338a06fca94073a0cf3381978662d46cf890602d3e9ccf6a31e4b69e8ecbd995e2beea00e804161a2b56a37ca1f6f4c4b8bce926587afa0d9b1acc5165e6556c959d583 txType -"#.trim() +".trim() ); } diff --git a/crates/test-utils/src/util.rs b/crates/test-utils/src/util.rs index 1bccadb2249c..3f4c44a450eb 100644 --- a/crates/test-utils/src/util.rs +++ b/crates/test-utils/src/util.rs @@ -852,12 +852,12 @@ mod tests { #[test] fn fixture_regex_matches() { assert!(IGNORE_IN_FIXTURES.is_match( - r#" + r" Location: cli/src/compile.rs:151 Backtrace omitted. - "# + " )); } }