fix: implement FromLua for Cha instead of AnyUserData

sxyazi · Nov 13, 2024 · 0d2e2b5 · 0d2e2b5
1 parent 0048652
commit 0d2e2b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -27,7 +27,7 @@ jobs:
           prefix-key: rust
           shared-key: ubuntu-latest@debug
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Clippy
@@ -50,7 +50,7 @@ jobs:
           prefix-key: rust
           shared-key: ubuntu-latest@debug
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Rustfmt

diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml
@@ -45,7 +45,7 @@ jobs:
           prefix-key: rust
           shared-key: ${{ matrix.target }}@release
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Build
@@ -78,7 +78,7 @@ jobs:
           prefix-key: rust
           shared-key: ${{ matrix.target }}@release
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Build
@@ -129,7 +129,7 @@ jobs:
           prefix-key: rust
           shared-key: ${{ matrix.target }}@release
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Build
@@ -157,7 +157,7 @@ jobs:
           prefix-key: rust
           shared-key: ${{ matrix.target }}@release
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Build

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
           prefix-key: rust
           shared-key: ${{ matrix.os }}@debug
 
-      - name: Run sccache-cache
+      - name: Run sccache
         uses: mozilla-actions/sccache-action@v0.0.6
 
       - name: Build

diff --git a/yazi-plugin/src/bindings/cha.rs b/yazi-plugin/src/bindings/cha.rs
@@ -1,10 +1,11 @@
 use std::{ops::Deref, time::{Duration, SystemTime, UNIX_EPOCH}};
 
-use mlua::{ExternalError, IntoLua, Lua, Table, UserData, UserDataFields, UserDataMethods};
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, UserDataMethods};
 use yazi_shared::fs::ChaKind;
 
 use crate::RtRef;
 
+#[derive(Clone, Copy, FromLua)]
 pub struct Cha(yazi_shared::fs::Cha);
 
 impl Deref for Cha {

diff --git a/yazi-plugin/src/file/file.rs b/yazi-plugin/src/file/file.rs
@@ -1,6 +1,6 @@
 use mlua::{AnyUserData, Lua, Table, UserDataRef};
 
-use crate::{bindings::Cast, impl_file_fields, impl_file_methods};
+use crate::{bindings::{Cast, Cha}, impl_file_fields, impl_file_methods};
 
 pub type FileRef = UserDataRef<yazi_shared::fs::File>;
 
@@ -21,7 +21,7 @@ impl File {
 			lua.create_function(|lua, t: Table| {
 				Self::cast(lua, yazi_shared::fs::File {
 					url: t.raw_get::<AnyUserData>("url")?.take()?,
-					cha: t.raw_get::<AnyUserData>("cha")?.take()?,
+					cha: *t.raw_get::<Cha>("cha")?,
 					..Default::default()
 				})
 			})?,