Skip to content

Commit e795052

Browse files
authored
Bump dependencies and versions (#88)
## Summary Another work on `with_external_definitions` requires those. ## Test Plan CI
1 parent b8702f1 commit e795052

33 files changed

Lines changed: 1670 additions & 637 deletions

Cargo.lock

Lines changed: 1282 additions & 206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.88.0"
33
profile = "default"

serde-generate/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ readme = "README.md"
1010
keywords = ["data-structures", "serialization", "serde"]
1111
categories = ["encoding", "development-tools"]
1212
edition = "2021"
13-
rust-version = "1.60"
13+
rust-version = "1.88.0"
1414
exclude = [
1515
# Readme template that doesn't need to be included.
1616
"README.tpl",
@@ -27,7 +27,7 @@ phf = { version = "0.10", features = ["macros"], optional = true }
2727
serde-reflection = { path = "../serde-reflection", version = "0.5.2" }
2828

2929
[dev-dependencies]
30-
alloy-sol-types = "0.8.18"
30+
alloy-sol-types = "1.1.2"
3131
hex = "0.4.3"
3232
lazy_static = "1.4.0"
3333
regex = "1.5.5"
@@ -38,7 +38,7 @@ serde_yaml = "0.8.17"
3838
bincode = "1.3.3"
3939
bcs = "0.1.3"
4040
maplit = "1.0.2"
41-
revm = "19.2.0"
41+
revm = { version = "34.0.0", default-features = false, features = ["std", "secp256k1", "portable"] }
4242
serde_json = "1.0.115"
4343

4444
[features]

serde-generate/src/analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ where
8282
// (If possible, visit children by increasing key.)
8383
queue.push(node.clone());
8484
if !children.contains_key(&node) {
85-
panic!("The node {:?} is missing", node);
85+
panic!("The node {node:?} is missing");
8686
}
8787
for child in children[&node].iter().rev() {
8888
if !seen.contains(child) {

serde-generate/src/cpp.rs

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ impl<'a> CodeGenerator<'a> {
4646
let mut external_qualified_names = HashMap::new();
4747
for (namespace, names) in &config.external_definitions {
4848
for name in names {
49-
external_qualified_names
50-
.insert(name.to_string(), format!("{}::{}", namespace, name));
49+
external_qualified_names.insert(name.to_string(), format!("{namespace}::{name}"));
5150
}
5251
}
5352
Self {
@@ -157,7 +156,7 @@ where
157156
path.push(name.to_string());
158157
if let Some(doc) = self.generator.config.comments.get(&path) {
159158
let text = textwrap::indent(doc, "/// ").replace("\n\n", "\n///\n");
160-
write!(self.out, "{}", text)?;
159+
write!(self.out, "{text}")?;
161160
}
162161
Ok(())
163162
}
@@ -169,7 +168,7 @@ where
169168
.custom_code
170169
.get(&self.current_namespace)
171170
{
172-
write!(self.out, "\n{}", code)?;
171+
write!(self.out, "\n{code}")?;
173172
}
174173
Ok(())
175174
}
@@ -191,7 +190,7 @@ where
191190
if require_known_size && !self.known_sizes.contains(x.as_str()) {
192191
// Cannot use unique_ptr because we need a copy constructor (e.g. for vectors)
193192
// and in-depth equality.
194-
format!("serde::value_ptr<{}>", qname)
193+
format!("serde::value_ptr<{qname}>")
195194
} else {
196195
qname
197196
}
@@ -253,7 +252,7 @@ where
253252
) -> Result<()> {
254253
writeln!(self.out)?;
255254
self.output_comment(name)?;
256-
writeln!(self.out, "struct {} {{", name)?;
255+
writeln!(self.out, "struct {name} {{")?;
257256
self.enter_class(name);
258257
for field in fields {
259258
self.output_comment(&field.name)?;
@@ -292,7 +291,7 @@ where
292291
}
293292

294293
fn output_container_forward_definition(&mut self, name: &str) -> Result<()> {
295-
writeln!(self.out, "\nstruct {};", name)
294+
writeln!(self.out, "\nstruct {name};")
296295
}
297296

298297
fn output_enum_container(
@@ -302,7 +301,7 @@ where
302301
) -> Result<()> {
303302
writeln!(self.out)?;
304303
self.output_comment(name)?;
305-
writeln!(self.out, "struct {} {{", name)?;
304+
writeln!(self.out, "struct {name} {{")?;
306305
self.enter_class(name);
307306
for (expected_index, (index, variant)) in variants.iter().enumerate() {
308307
assert_eq!(*index, expected_index as u32);
@@ -312,8 +311,8 @@ where
312311
self.out,
313312
"\nstd::variant<{}> value;",
314313
variants
315-
.iter()
316-
.map(|(_, v)| v.name.clone())
314+
.values()
315+
.map(|v| v.name.clone())
317316
.collect::<Vec<_>>()
318317
.join(", "),
319318
)?;
@@ -327,8 +326,7 @@ where
327326
fn output_class_method_declarations(&mut self, name: &str) -> Result<()> {
328327
writeln!(
329328
self.out,
330-
"friend bool operator==(const {}&, const {}&);",
331-
name, name
329+
"friend bool operator==(const {name}&, const {name}&);"
332330
)?;
333331
if self.generator.config.serialization {
334332
for encoding in &self.generator.config.encodings {
@@ -372,15 +370,13 @@ where
372370
fn output_struct_equality_test(&mut self, name: &str, fields: &[&str]) -> Result<()> {
373371
writeln!(
374372
self.out,
375-
"\ninline bool operator==(const {0} &lhs, const {0} &rhs) {{",
376-
name,
373+
"\ninline bool operator==(const {name} &lhs, const {name} &rhs) {{",
377374
)?;
378375
self.out.indent();
379376
for field in fields {
380377
writeln!(
381378
self.out,
382-
"if (!(lhs.{0} == rhs.{0})) {{ return false; }}",
383-
field,
379+
"if (!(lhs.{field} == rhs.{field})) {{ return false; }}",
384380
)?;
385381
}
386382
writeln!(self.out, "return true;")?;
@@ -443,8 +439,7 @@ inline {} {}::{}Deserialize(std::vector<uint8_t> input) {{
443439
r#"
444440
template <>
445441
template <typename Serializer>
446-
void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer) {{"#,
447-
name,
442+
void serde::Serializable<{name}>::serialize(const {name} &obj, Serializer &serializer) {{"#,
448443
)?;
449444
self.out.indent();
450445
if is_container {
@@ -453,8 +448,7 @@ void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer)
453448
for field in fields {
454449
writeln!(
455450
self.out,
456-
"serde::Serializable<decltype(obj.{0})>::serialize(obj.{0}, serializer);",
457-
field,
451+
"serde::Serializable<decltype(obj.{field})>::serialize(obj.{field}, serializer);",
458452
)?;
459453
}
460454
if is_container {
@@ -475,19 +469,17 @@ void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer)
475469
r#"
476470
template <>
477471
template <typename Deserializer>
478-
{0} serde::Deserializable<{0}>::deserialize(Deserializer &deserializer) {{"#,
479-
name,
472+
{name} serde::Deserializable<{name}>::deserialize(Deserializer &deserializer) {{"#,
480473
)?;
481474
self.out.indent();
482475
if is_container {
483476
writeln!(self.out, "deserializer.increase_container_depth();")?;
484477
}
485-
writeln!(self.out, "{} obj;", name)?;
478+
writeln!(self.out, "{name} obj;")?;
486479
for field in fields {
487480
writeln!(
488481
self.out,
489-
"obj.{0} = serde::Deserializable<decltype(obj.{0})>::deserialize(deserializer);",
490-
field,
482+
"obj.{field} = serde::Deserializable<decltype(obj.{field})>::deserialize(deserializer);",
491483
)?;
492484
}
493485
if is_container {

0 commit comments

Comments
 (0)