From f015a5c87366ed6a62a510201212ecdc16e93583 Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Sat, 25 Mar 2023 01:42:47 +0100 Subject: [PATCH] chore: update prettyplease --- Cargo.lock | 16 ++++++++-------- .../ethers-contract-abigen/Cargo.toml | 2 +- .../ethers-contract-abigen/src/lib.rs | 8 +++----- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54a54dcd..dd5c524f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1262,7 +1262,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn 2.0.0", + "syn 2.0.9", "tempfile", "tokio", "toml", @@ -1281,7 +1281,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.0", + "syn 2.0.9", ] [[package]] @@ -1308,7 +1308,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.0", + "syn 2.0.9", "tempfile", "thiserror", "tiny-keccak", @@ -3023,12 +3023,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "c17f5e28f5d12fb805aea10d72d50d2d9b005b267e71c44d0a33a847e45ed795" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.9", ] [[package]] @@ -3994,9 +3994,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.0" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774" +checksum = "0da4a3c17e109f700685ec577c0f85efd9b19bcf15c913985f14dc1ac01775aa" dependencies = [ "proc-macro2", "quote", diff --git a/ethers-contract/ethers-contract-abigen/Cargo.toml b/ethers-contract/ethers-contract-abigen/Cargo.toml index 9eed14a6..67cb8028 100644 --- a/ethers-contract/ethers-contract-abigen/Cargo.toml +++ b/ethers-contract/ethers-contract-abigen/Cargo.toml @@ -31,7 +31,7 @@ ethers-core = { workspace = true, features = ["macros"] } proc-macro2.workspace = true quote.workspace = true syn = { workspace = true, features = ["full"] } -prettyplease = "0.1.25" +prettyplease = "0.2.1" Inflector.workspace = true serde.workspace = true diff --git a/ethers-contract/ethers-contract-abigen/src/lib.rs b/ethers-contract/ethers-contract-abigen/src/lib.rs index 2dac925c..8ea9a972 100644 --- a/ethers-contract/ethers-contract-abigen/src/lib.rs +++ b/ethers-contract/ethers-contract-abigen/src/lib.rs @@ -301,11 +301,9 @@ impl ToTokens for ContractBindings { impl fmt::Display for ContractBindings { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if self.format { - // TODO: - todo!("enable formatting when prettyplease uses syn 2.0") - // let syntax_tree = syn::parse2::(self.tokens.clone()).unwrap(); - // let s = prettyplease::unparse(&syntax_tree); - // f.write_str(&s) + let syntax_tree = syn::parse2::(self.tokens.clone()).unwrap(); + let s = prettyplease::unparse(&syntax_tree); + f.write_str(&s) } else { fmt::Display::fmt(&self.tokens, f) }