From 41b337574948f5f8e597e9ba5fae01fe1f6e66d9 Mon Sep 17 00:00:00 2001
From: ErrorNoInternet <errornointernet@envs.net>
Date: Sat, 15 Mar 2025 15:07:26 -0400
Subject: [PATCH] refactor: clean up import paths
---
src/lua/direction.rs | 4 ++--
src/lua/matrix/client.rs | 6 +++---
src/lua/matrix/member.rs | 4 ++--
src/lua/matrix/room.rs | 6 +++---
src/lua/nochatreports/key.rs | 4 ++--
src/lua/vec3.rs | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lua/direction.rs b/src/lua/direction.rs
index 973d41c..74282f4 100644
--- a/src/lua/direction.rs
+++ b/src/lua/direction.rs
@@ -1,5 +1,5 @@
use azalea::entity::LookDirection;
-use mlua::{FromLua, IntoLua, Lua, Result, Value};
+use mlua::{Error, FromLua, IntoLua, Lua, Result, Value};
#[derive(Clone)]
pub struct Direction {
@@ -37,7 +37,7 @@ impl FromLua for Direction {
}
})
} else {
- Err(mlua::Error::FromLuaConversionError {
+ Err(Error::FromLuaConversionError {
from: value.type_name(),
to: "Direction".to_string(),
message: None,
diff --git a/src/lua/matrix/client.rs b/src/lua/matrix/client.rs
index bbd9a41..711cbe1 100644
--- a/src/lua/matrix/client.rs
+++ b/src/lua/matrix/client.rs
@@ -1,12 +1,12 @@
use super::room::Room;
use matrix_sdk::{Client as MatrixClient, ruma::UserId};
-use mlua::{Error, UserData};
+use mlua::{Error, UserData, UserDataFields, UserDataMethods};
use std::sync::Arc;
pub struct Client(pub Arc<MatrixClient>);
impl UserData for Client {
- fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
+ fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
f.add_field_method_get("rooms", |_, this| {
Ok(this.0.rooms().into_iter().map(Room).collect::<Vec<_>>())
});
@@ -15,7 +15,7 @@ impl UserData for Client {
});
}
- fn add_methods<M: mlua::UserDataMethods<Self>>(m: &mut M) {
+ fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
m.add_async_method("create_dm", async |_, this, user_id: String| {
this.0
.create_dm(&UserId::parse(user_id).map_err(Error::external)?)
diff --git a/src/lua/matrix/member.rs b/src/lua/matrix/member.rs
index 03e0166..c799b80 100644
--- a/src/lua/matrix/member.rs
+++ b/src/lua/matrix/member.rs
@@ -1,10 +1,10 @@
use matrix_sdk::room::RoomMember;
-use mlua::UserData;
+use mlua::{UserData, UserDataFields};
pub struct Member(pub RoomMember);
impl UserData for Member {
- fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
+ fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
f.add_field_method_get("id", |_, this| Ok(this.0.user_id().to_string()));
f.add_field_method_get("name", |_, this| Ok(this.0.name().to_owned()));
f.add_field_method_get("power_level", |_, this| Ok(this.0.power_level()));
diff --git a/src/lua/matrix/room.rs b/src/lua/matrix/room.rs
index bbfd0e8..88aea9b 100644
--- a/src/lua/matrix/room.rs
+++ b/src/lua/matrix/room.rs
@@ -2,12 +2,12 @@ use super::member::Member;
use matrix_sdk::{
RoomMemberships, room::Room as MatrixRoom, ruma::events::room::message::RoomMessageEventContent,
};
-use mlua::{Error, UserData};
+use mlua::{Error, UserData, UserDataFields, UserDataMethods};
pub struct Room(pub MatrixRoom);
impl UserData for Room {
- fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
+ fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
f.add_field_method_get("id", |_, this| Ok(this.0.room_id().to_string()));
f.add_field_method_get("name", |_, this| Ok(this.0.name()));
f.add_field_method_get("topic", |_, this| Ok(this.0.topic()));
@@ -16,7 +16,7 @@ impl UserData for Room {
});
}
- fn add_methods<M: mlua::UserDataMethods<Self>>(m: &mut M) {
+ fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
m.add_async_method("send", async |_, this, body: String| {
this.0
.send(RoomMessageEventContent::text_plain(body))
diff --git a/src/lua/nochatreports/key.rs b/src/lua/nochatreports/key.rs
index 9e4123a..6cdb7f3 100644
--- a/src/lua/nochatreports/key.rs
+++ b/src/lua/nochatreports/key.rs
@@ -1,9 +1,9 @@
-use mlua::UserData;
+use mlua::{UserData, UserDataFields};
pub struct AesKey(pub ncr::AesKey);
impl UserData for AesKey {
- fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
+ fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
f.add_field_method_get("base64", |_, this| Ok(this.0.encode_base64()));
f.add_field_method_get("bytes", |_, this| Ok(this.0.as_ref().to_vec()));
}
diff --git a/src/lua/vec3.rs b/src/lua/vec3.rs
index d62c7d7..bb397c2 100644
--- a/src/lua/vec3.rs
+++ b/src/lua/vec3.rs
@@ -1,5 +1,5 @@
use azalea::{BlockPos, entity::Position};
-use mlua::{FromLua, IntoLua, Lua, Result, Value};
+use mlua::{Error, FromLua, IntoLua, Lua, Result, Value};
#[derive(Clone)]
pub struct Vec3 {
@@ -63,7 +63,7 @@ impl FromLua for Vec3 {
},
)
} else {
- Err(mlua::Error::FromLuaConversionError {
+ Err(Error::FromLuaConversionError {
from: value.type_name(),
to: "Vec3".to_string(),
message: None,