chore(clippy): make clippy happy (#2618)

* chore(clippy): make clippy happy * raw strings
gakonst · Sep 28, 2023 · 3b4b47a · 3b4b47a
1 parent eb29df1
commit 3b4b47a
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 153 deletions.
diff --git a/book/providers/http.md b/book/providers/http.md
@@ -83,7 +83,7 @@ use std::sync::Arc;
 
 abigen!(
     IUniswapV2Pair,
-    r#"[function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast)]"#
+    "[function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast)]"
 );
 
 #[tokio::main]

diff --git a/ethers-contract/ethers-contract-abigen/src/multi.rs b/ethers-contract/ethers-contract-abigen/src/multi.rs
@@ -881,12 +881,12 @@ mod tests {
 
         let human_readable = Abigen::new(
             "HrContract",
-            r#"[
+            r"[
         struct Foo { uint256 x; }
         function foo(Foo memory x)
         function bar(uint256 x, uint256 y, address addr)
         yeet(uint256,uint256,address)
-    ]"#,
+    ]",
         )
         .unwrap();
 
@@ -1001,9 +1001,9 @@ mod tests {
             multi_gen.push(
                 Abigen::new(
                     "AdditionalContract",
-                    r#"[
+                    r"[
                         getValue() (uint256)
-                    ]"#,
+                    ]",
                 )
                 .unwrap(),
             );
@@ -1028,9 +1028,9 @@ mod tests {
             multi_gen.push(
                 Abigen::new(
                     "AdditionalContract",
-                    r#"[
+                    r"[
                         getValue() (uint256)
-                    ]"#,
+                    ]",
                 )
                 .unwrap(),
             );
@@ -1062,9 +1062,9 @@ mod tests {
             multi_gen.push(
                 Abigen::new(
                     "AdditionalContract",
-                    r#"[
+                    r"[
                             getValue() (uint256)
-                        ]"#,
+                        ]",
                 )
                 .unwrap(),
             );
@@ -1099,9 +1099,9 @@ mod tests {
             multi_gen.push(
                 Abigen::new(
                     "AdditionalContract",
-                    r#"[
+                    r"[
                             getValue() (uint256)
-                        ]"#,
+                        ]",
                 )
                 .unwrap(),
             );
@@ -1121,11 +1121,11 @@ mod tests {
     fn does_not_generate_shared_types_if_empty() {
         let gen = Abigen::new(
             "Greeter",
-            r#"[
+            r"[
                         struct Inner {bool a;}
                         greet1() (uint256)
                         greet2(Inner inner) (string)
-                    ]"#,
+                    ]",
         )
         .unwrap();
 
@@ -1137,9 +1137,9 @@ mod tests {
     fn can_filter_abigen() {
         let abi = Abigen::new(
             "MyGreeter",
-            r#"[
+            r"[
                         greet() (string)
-                    ]"#,
+                    ]",
         )
         .unwrap();
         let mut gen = MultiAbigen::from_abigens(vec![abi]).with_filter(ContractFilter::All);
@@ -1167,9 +1167,9 @@ mod tests {
         gen.push(
             Abigen::new(
                 "MyGreeterTest",
-                r#"[
+                r"[
                         greet() (string)
-                    ]"#,
+                    ]",
             )
             .unwrap(),
         );

diff --git a/ethers-contract/src/contract.rs b/ethers-contract/src/contract.rs
@@ -125,7 +125,7 @@ pub type Contract<M> = ContractInstance<std::sync::Arc<M>, M>;
 /// use ethers_core::abi::{Detokenize, Token, InvalidOutputType};
 /// # // this is a fake address used just for this example
 /// # let address = "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee".parse::<Address>()?;
-/// # let abi: Abi = serde_json::from_str(r#"[]"#)?;
+/// # let abi: Abi = serde_json::from_str("[]")?;
 /// # let client = Provider::<Http>::try_from("http://localhost:8545").unwrap();
 /// # let contract = Contract::new(address, abi, Arc::new(client));
 ///

diff --git a/ethers-core/src/abi/human_readable/mod.rs b/ethers-core/src/abi/human_readable/mod.rs
@@ -34,11 +34,11 @@ impl AbiParser {
     ///
     /// ```
     ///  # use ethers_core::abi::AbiParser;
-    /// let abi = AbiParser::default().parse_str(r#"[
+    /// let abi = AbiParser::default().parse_str("[
     ///         function setValue(string)
     ///         function getValue() external view returns (string)
     ///         event ValueChanged(address indexed author, string oldValue, string newValue)
-    ///     ]"#).unwrap();
+    ///     ]").unwrap();
     /// ```
     pub fn parse_str(&mut self, s: &str) -> Result<Abi> {
         self.parse(

diff --git a/ethers-core/src/types/syncing.rs b/ethers-core/src/types/syncing.rs
@@ -151,7 +151,7 @@ mod tests {
 
     #[test]
     fn deserialize_sync_false() {
-        let s = r#"false"#;
+        let s = r"false";
 
         let sync: SyncingStatus = serde_json::from_str(s).unwrap();
         match sync {

diff --git a/ethers-core/src/types/trace/geth/noop.rs b/ethers-core/src/types/trace/geth/noop.rs
@@ -12,7 +12,7 @@ mod tests {
     use super::*;
     use crate::types::*;
 
-    const DEFAULT: &str = r#"{}"#;
+    const DEFAULT: &str = r"{}";
 
     #[test]
     fn test_serialize_noop_trace() {

diff --git a/ethers-providers/src/rpc/provider.rs b/ethers-providers/src/rpc/provider.rs
@@ -598,7 +598,7 @@ impl<P: JsonRpcClient> Middleware for Provider<P> {
         _tx: &TypedTransaction,
         _from: Address,
     ) -> Result<Signature, Self::Error> {
-        Err(ProviderError::SignerUnavailable).map_err(MiddlewareError::from_err)
+        Err(MiddlewareError::from_err(ProviderError::SignerUnavailable))
     }
 
     ////// Contract state

diff --git a/ethers-solc/src/compile/project.rs b/ethers-solc/src/compile/project.rs
@@ -752,12 +752,12 @@ mod tests {
 
         tmp.add_source(
             "C",
-            r#"
+            r"
     pragma solidity ^0.8.10;
     contract C {
             function hello() public {}
     }
-   "#,
+   ",
         )
         .unwrap();
         let compiled = tmp.compile().unwrap();

diff --git a/ethers-solc/src/utils.rs b/ethers-solc/src/utils.rs
@@ -507,10 +507,10 @@ mod tests {
         let non_existing = path.join("test.sol");
         std::fs::write(
             existing,
-            r#"
+            "
 pragma solidity ^0.8.10;
 contract A {}
-        "#,
+        ",
         )
         .unwrap();
 
@@ -592,7 +592,7 @@ contract A {}
 
     #[test]
     fn can_find_single_quote_imports() {
-        let content = r#"
+        let content = r"
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.6;
 
@@ -601,7 +601,7 @@ import '@openzeppelin/contracts/utils/Address.sol';
 
 import './../interfaces/IJBDirectory.sol';
 import './../libraries/JBTokens.sol';
-        "#;
+        ";
         let imports: Vec<_> = find_import_paths(content).map(|m| m.as_str()).collect();
 
         assert_eq!(
@@ -631,9 +631,9 @@ import { T } from '../Test2.sol';
     }
     #[test]
     fn can_find_version() {
-        let s = r##"//SPDX-License-Identifier: Unlicense
+        let s = r"//SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.0;
-"##;
+";
         assert_eq!(Some("^0.8.0"), find_version_pragma(s).map(|s| s.as_str()));
     }