From 8b0121547aaf19f23d35c8a4f2e0cc2f554847c8 Mon Sep 17 00:00:00 2001 From: shulaoda Date: Thu, 14 Nov 2024 23:20:46 +0800 Subject: [PATCH 1/2] fix(tasks): cargo clippy error on rust stable toolchain --- tasks/ast_tools/src/generators/typescript.rs | 21 +++++++++++--------- tasks/ast_tools/src/layout.rs | 8 ++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tasks/ast_tools/src/generators/typescript.rs b/tasks/ast_tools/src/generators/typescript.rs index 8baae4f4c8baf..cc42671051a10 100644 --- a/tasks/ast_tools/src/generators/typescript.rs +++ b/tasks/ast_tools/src/generators/typescript.rs @@ -108,15 +108,18 @@ fn typescript_struct(def: &StructDef, always_flatten_structs: &FxHashSet let ident = field.ident().unwrap(); if let Some(append_after) = append_to.get(&ident.to_string()) { - let after_type = match &append_after.markers.derive_attributes.estree.typescript_type { - Some(ty) => ty.clone(), - None => { - let typ = append_after.typ.name(); - if let TypeName::Opt(inner) = typ { - type_to_string(inner) - } else { - panic!("expected field labeled with append_to to be Option<...>, but found {typ}"); - } + let after_type = if let Some(ty) = + &append_after.markers.derive_attributes.estree.typescript_type + { + ty.clone() + } else { + let typ = append_after.typ.name(); + if let TypeName::Opt(inner) = typ { + type_to_string(inner) + } else { + panic!( + "expected field labeled with append_to to be Option<...>, but found {typ}" + ); } }; if let Some(inner) = ty.strip_prefix("Array<") { diff --git a/tasks/ast_tools/src/layout.rs b/tasks/ast_tools/src/layout.rs index e380056e642cb..1c6a8a315fa67 100644 --- a/tasks/ast_tools/src/layout.rs +++ b/tasks/ast_tools/src/layout.rs @@ -160,10 +160,10 @@ impl Layout { /// For `n` bigger than `16`, Or if it's not a power of 2 number fn max_val_of_bytes(n: usize) -> u128 { match n { - 1 => u8::MAX as u128, - 2 => u16::MAX as u128, - 4 => u32::MAX as u128, - 8 => u64::MAX as u128, + 1 => u128::from(u8::MAX), + 2 => u128::from(u16::MAX), + 4 => u128::from(u32::MAX), + 8 => u128::from(u64::MAX), 16 => u128::MAX, _ => panic!("We do not support `n` bigger than 16 bytes."), } From 4cafbfc74771663401c764aabfa2c384eb493bca Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:25:12 +0000 Subject: [PATCH 2/2] [autofix.ci] apply automated fixes --- tasks/ast_tools/src/generators/typescript.rs | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tasks/ast_tools/src/generators/typescript.rs b/tasks/ast_tools/src/generators/typescript.rs index cc42671051a10..bcad09ef3f690 100644 --- a/tasks/ast_tools/src/generators/typescript.rs +++ b/tasks/ast_tools/src/generators/typescript.rs @@ -108,20 +108,19 @@ fn typescript_struct(def: &StructDef, always_flatten_structs: &FxHashSet let ident = field.ident().unwrap(); if let Some(append_after) = append_to.get(&ident.to_string()) { - let after_type = if let Some(ty) = - &append_after.markers.derive_attributes.estree.typescript_type - { - ty.clone() - } else { - let typ = append_after.typ.name(); - if let TypeName::Opt(inner) = typ { - type_to_string(inner) + let after_type = + if let Some(ty) = &append_after.markers.derive_attributes.estree.typescript_type { + ty.clone() } else { - panic!( + let typ = append_after.typ.name(); + if let TypeName::Opt(inner) = typ { + type_to_string(inner) + } else { + panic!( "expected field labeled with append_to to be Option<...>, but found {typ}" ); - } - }; + } + }; if let Some(inner) = ty.strip_prefix("Array<") { ty = format!("Array<{after_type} | {inner}"); } else {