fix(pilota-build): don't derive eq for nested list double

cloudwego · Dec 11, 2024 · 8d4e95f · 8d4e95f
1 parent f6859a9
commit 8d4e95f
Show file tree

Hide file tree

Showing 6 changed files with 1,041 additions and 839 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pilota-build/Cargo.toml b/pilota-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pilota-build"
-version = "0.11.27"
+version = "0.11.28"
 edition = "2021"
 description = "Compile thrift and protobuf idl into rust code at compile-time."
 documentation = "https://docs.rs/pilota-build"

diff --git a/pilota-build/src/lib.rs b/pilota-build/src/lib.rs
@@ -378,10 +378,10 @@ where
         cx.exec_plugin(AutoDerivePlugin::new(
             Arc::from(["#[derive(PartialOrd)]".into()]),
             |ty| {
-                let ty = match &ty.kind {
-                    ty::Vec(ty) => ty,
-                    _ => ty,
-                };
+                let mut ty = ty;
+                while let ty::Vec(_ty) = &ty.kind {
+                    ty = _ty;
+                }
                 if matches!(ty.kind, ty::Map(_, _) | ty::Set(_)) {
                     PredicateResult::No
                 } else {
@@ -393,10 +393,10 @@ where
         cx.exec_plugin(AutoDerivePlugin::new(
             Arc::from(["#[derive(Hash, Eq, Ord)]".into()]),
             |ty| {
-                let ty = match &ty.kind {
-                    ty::Vec(ty) => ty,
-                    _ => ty,
-                };
+                let mut ty = ty;
+                while let ty::Vec(_ty) = &ty.kind {
+                    ty = _ty;
+                }
                 if matches!(ty.kind, ty::Map(_, _) | ty::Set(_) | ty::F64 | ty::F32) {
                     PredicateResult::No
                 } else {

diff --git a/pilota-build/src/middle/context.rs b/pilota-build/src/middle/context.rs
@@ -1,9 +1,4 @@
-use std::{
-    collections::{HashMap, HashSet},
-    ops::Deref,
-    path::PathBuf,
-    sync::Arc,
-};
+use std::{collections::HashMap, ops::Deref, path::PathBuf, sync::Arc};
 
 use anyhow::Context as _;
 use dashmap::DashMap;