kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove regnster_fn support for first argument of &type (not used).

Browse Source
This commit is contained in:
Stephen Chung 2020-03-25 17:21:58 +08:00
parent ff8756018b
commit 2bb2e871ab
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fn_register.rs
View File

@ -100,6 +100,8 @@ pub trait RegisterResultFn<FN, ARGS, RET> {
// These types are used to build a unique _marker_ tuple type for each combination // These types are used to build a unique _marker_ tuple type for each combination
// of function parameter types in order to make each trait implementation unique. // of function parameter types in order to make each trait implementation unique.
// That is because stable Rust currently does not allow distinguishing implementations
// based purely on parameter types of traits (Fn, FnOnce and FnMut).
// //
// For example: // For example:
// //
@ -110,8 +112,8 @@ pub trait RegisterResultFn<FN, ARGS, RET> {
// `FN: (&mut A, B, &C) -> R` // `FN: (&mut A, B, &C) -> R`
// //
// These types are not actually used anywhere. // These types are not actually used anywhere.
pub struct Ref<A>(A); pub struct Mut<T>(T);
pub struct Mut<A>(A); //pub struct Ref<T>(T);
/// Identity dereferencing function. /// Identity dereferencing function.
#[inline] #[inline]
@ -131,7 +133,7 @@ macro_rules! def_register {
}; };
(imp $($par:ident => $mark:ty => $param:ty => $clone:expr),*) => { (imp $($par:ident => $mark:ty => $param:ty => $clone:expr),*) => {
// ^ function parameter generic type name // ^ function parameter generic type name
// ^ function parameter marker type (A, Ref<A> or Mut<A>) // ^ function parameter marker type (T, Ref<T> or Mut<T>)
// ^ function parameter actual type // ^ function parameter actual type
// ^ dereferencing function // ^ dereferencing function
impl< impl<
@ -237,11 +239,13 @@ macro_rules! def_register {
}; };
($p0:ident $(, $p:ident)*) => { ($p0:ident $(, $p:ident)*) => {
def_register!(imp $p0 => $p0 => $p0 => Clone::clone $(, $p => $p => $p => Clone::clone)*); def_register!(imp $p0 => $p0 => $p0 => Clone::clone $(, $p => $p => $p => Clone::clone)*);
def_register!(imp $p0 => Ref<$p0> => &$p0 => identity $(, $p => $p => $p => Clone::clone)*);
def_register!(imp $p0 => Mut<$p0> => &mut $p0 => identity $(, $p => $p => $p => Clone::clone)*); def_register!(imp $p0 => Mut<$p0> => &mut $p0 => identity $(, $p => $p => $p => Clone::clone)*);
// handle the first parameter ^ first parameter passed through // handle the first parameter ^ first parameter passed through
// others passed by value (cloned) ^ // others passed by value (cloned) ^
// No support for functions where the first argument is a reference
//def_register!(imp $p0 => Ref<$p0> => &$p0 => identity $(, $p => $p => $p => Clone::clone)*);
def_register!($($p),*); def_register!($($p),*);
}; };
// (imp_pop) => {}; // (imp_pop) => {};
@ -251,4 +255,4 @@ macro_rules! def_register {
} }
#[rustfmt::skip] #[rustfmt::skip]
def_register!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T); def_register!(A, B, C, D, E, F, G, H, J, K, L, M, N, P, Q, R, S, T, U, V);