Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::io;
use serde::ser::{Serialize, Serializer};

use crate::state::RawLua;
use crate::traits::HasValueRef;
use crate::types::ValueRef;

/// A Luau buffer type.
Expand Down Expand Up @@ -161,6 +162,12 @@ impl io::Seek for BufferCursor {
}
}

impl HasValueRef for Buffer {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

#[cfg(feature = "serde")]
impl Serialize for Buffer {
fn serialize<S: Serializer>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error> {
Expand Down
8 changes: 7 additions & 1 deletion src/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ use std::{mem, ptr, slice};
use crate::error::{Error, ExternalError, ExternalResult, Result};
use crate::state::Lua;
use crate::table::Table;
use crate::traits::{FromLuaMulti, IntoLua, IntoLuaMulti};
use crate::traits::{FromLuaMulti, HasValueRef, IntoLua, IntoLuaMulti};
use crate::types::{Callback, LuaType, MaybeSend, ValueRef};
use crate::util::{
StackGuard, assert_stack, check_stack, linenumber_to_usize, pop_error, ptr_to_lossy_str, ptr_to_str,
Expand Down Expand Up @@ -749,6 +749,12 @@ impl IntoLua for WrappedAsyncFunction {
}
}

impl HasValueRef for Function {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

impl LuaType for Function {
const TYPE_ID: c_int = ffi::LUA_TFUNCTION;
}
Expand Down
8 changes: 7 additions & 1 deletion src/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{cmp, fmt, mem, slice, str};

use crate::error::{Error, Result};
use crate::state::Lua;
use crate::traits::IntoLua;
use crate::traits::{HasValueRef, IntoLua};
use crate::types::{LuaType, ValueRef};
use crate::value::Value;

Expand Down Expand Up @@ -215,6 +215,12 @@ impl Hash for LuaString {
}
}

impl HasValueRef for LuaString {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

#[cfg(feature = "serde")]
impl Serialize for LuaString {
fn serialize<S>(&self, serializer: S) -> StdResult<S::Ok, S::Error>
Expand Down
8 changes: 7 additions & 1 deletion src/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ use std::os::raw::c_void;
use crate::error::{Error, Result};
use crate::function::Function;
use crate::state::{LuaGuard, RawLua, WeakLua};
use crate::traits::{FromLua, FromLuaMulti, IntoLua, IntoLuaMulti, ObjectLike};
use crate::traits::{FromLua, FromLuaMulti, HasValueRef, IntoLua, IntoLuaMulti, ObjectLike};
use crate::types::{Integer, ValueRef};
use crate::util::{StackGuard, assert_stack, check_stack, get_metatable_ptr};
use crate::value::{Nil, Value};
Expand Down Expand Up @@ -1226,6 +1226,12 @@ impl ObjectLike for Table {
}
}

impl HasValueRef for Table {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

/// A wrapped [`Table`] with customized serialization behavior.
#[cfg(feature = "serde")]
pub(crate) struct SerializableTable<'a> {
Expand Down
8 changes: 7 additions & 1 deletion src/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use std::os::raw::{c_int, c_void};
use crate::error::{Error, Result};
use crate::function::Function;
use crate::state::RawLua;
use crate::traits::{FromLuaMulti, IntoLuaMulti};
use crate::traits::{FromLuaMulti, HasValueRef, IntoLuaMulti};
use crate::types::{LuaType, ValueRef};
use crate::util::{StackGuard, check_stack, error_traceback_thread, pop_error};

Expand Down Expand Up @@ -769,6 +769,12 @@ impl fmt::Debug for Thread {
}
}

impl HasValueRef for Thread {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

impl LuaType for Thread {
const TYPE_ID: c_int = ffi::LUA_TTHREAD;
}
Expand Down
12 changes: 12 additions & 0 deletions src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::error::{Error, Result};
use crate::multi::MultiValue;
use crate::private::Sealed;
use crate::state::{Lua, RawLua, WeakLua};
use crate::types::ValueRef;
use crate::util::{check_stack, parse_lookup_path, short_type_name};
use crate::value::Value;

Expand Down Expand Up @@ -249,6 +250,17 @@ pub trait ObjectLike: Sealed {
fn weak_lua(&self) -> &WeakLua;
}

/// A trait for types that have a [`ValueRef`].
pub trait HasValueRef: Sized {
/// Convert to a [`ValueRef`].
fn to_vref(&self) -> &ValueRef;
}

pub trait MaybeHasValueRef: Sized {
/// Convert compatiable types to a [`ValueRef`].
fn maybe_to_vref(&self) -> Option<&ValueRef>;
}

pub(crate) trait ShortTypeName {
#[inline(always)]
fn type_name() -> String {
Expand Down
8 changes: 7 additions & 1 deletion src/userdata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::function::Function;
use crate::state::Lua;
use crate::string::LuaString;
use crate::table::{Table, TablePairs};
use crate::traits::{FromLua, FromLuaMulti, IntoLua, IntoLuaMulti};
use crate::traits::{FromLua, FromLuaMulti, HasValueRef, IntoLua, IntoLuaMulti};
use crate::types::{MaybeSend, MaybeSync, ValueRef};
use crate::util::{StackGuard, check_stack, get_userdata, push_string, short_type_name, take_userdata};
use crate::value::Value;
Expand Down Expand Up @@ -1121,6 +1121,12 @@ impl AnyUserData {
}
}

impl HasValueRef for AnyUserData {
fn to_vref(&self) -> &ValueRef {
&self.0
}
}

impl fmt::Debug for AnyUserData {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
if fmt.alternate() {
Expand Down
28 changes: 28 additions & 0 deletions src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::function::Function;
use crate::string::LuaString;
use crate::table::Table;
use crate::thread::Thread;
use crate::traits::MaybeHasValueRef;
use crate::types::{Integer, LightUserData, Number, ValueRef};
use crate::userdata::AnyUserData;
use crate::util::{StackGuard, check_stack};
Expand Down Expand Up @@ -560,6 +561,33 @@ impl Value {
}
}

impl MaybeHasValueRef for Value {
fn maybe_to_vref(&self) -> Option<&ValueRef> {
#[cfg(feature = "luau")]
use crate::buffer::Buffer;
// Don't use the `_` pattern, as may be over looking in the future causing compatiable types to
// return `None`.
match self {
Self::Nil => None,
Self::Boolean(_) => None,
Self::LightUserData(_) => None,
Self::Error(_) => None,
Self::Function(Function(vref)) => Some(vref),
Self::Integer(_) => None,
Self::Number(_) => None,
Self::String(LuaString(vref)) => Some(vref),
Self::Table(Table(vref)) => Some(vref),
Self::Thread(Thread(vref, _)) => Some(vref),
#[cfg(feature = "luau")]
Self::Buffer(Buffer(vref)) => Some(vref),
#[cfg(feature = "luau")]
Self::Vector(_) => None,
Self::UserData(AnyUserData(vref)) => Some(vref),
Self::Other(vref) => Some(vref),
}
}
}

impl fmt::Debug for Value {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
if fmt.alternate() {
Expand Down