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

* fix(pilota-build): don't derive eq for nested list double * chore: use stable toolchain for ci
cloudwego · Dec 11, 2024 · 47c136c · 47c136c
1 parent f6859a9
commit 47c136c
Show file tree

Hide file tree

Showing 7 changed files with 1,081 additions and 879 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: 'CI'
+name: "CI"
 on:
   pull_request:
   push:
@@ -26,22 +26,22 @@ jobs:
     runs-on: [self-hosted, X64]
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        components: rustfmt, clippy
-    # - uses: Swatinem/rust-cache@v1
-    - name: Run tests
-      run: |
-        cargo check
-        cargo test
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+      # - uses: Swatinem/rust-cache@v1
+      - name: Run tests
+        run: |
+          cargo check
+          cargo test
 
   # test-linux-aarch64:
   #   runs-on: [self-hosted, arm]
 
   #   steps:
   #   - uses: actions/checkout@v3
-  #   - uses: dtolnay/rust-toolchain@nightly
+  #   - uses: dtolnay/rust-toolchain@stable
   #     with:
   #       components: rustfmt, clippy
   #   # - uses: Swatinem/rust-cache@v1
@@ -54,29 +54,29 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        components: rustfmt, clippy
-    - uses: Swatinem/rust-cache@v1
-    - name: Run tests
-      run: |
-        cargo check
-        cargo test
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+      - uses: Swatinem/rust-cache@v1
+      - name: Run tests
+        run: |
+          cargo check
+          cargo test
 
   test-windows:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        components: rustfmt, clippy
-    - uses: Swatinem/rust-cache@v1
-    - name: Run tests
-      run: |
-        cargo check
-        cargo test
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+      - uses: Swatinem/rust-cache@v1
+      - name: Run tests
+        run: |
+          cargo check
+          cargo test
 
   lint:
     runs-on: [self-hosted, X64]
@@ -87,14 +87,14 @@ jobs:
           - nightly
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        components: rustfmt, clippy
-    # - uses: Swatinem/rust-cache@v1
-    - uses: actions-rs/clippy-check@v1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Format check
-      run: |
-        cargo fmt -- --check
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt, clippy
+      # - uses: Swatinem/rust-cache@v1
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Format check
+        run: |
+          cargo fmt -- --check
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;