Skip to content

Remove unused code in eldritch-core conversion.rs #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KCarretto merged 1 commit into from
Dec 12, 2025
Merged

Remove unused code in eldritch-core conversion.rs #1304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 0 additions & 55 deletions implants/lib/eldritchv2/eldritch-core/src/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,6 @@ where
}
}

// Function trait and adapter
pub trait EldritchFunction<Marker> {
fn call(&self, args: &[Value]) -> Result<Value, String>;
}

// Call stub helper
pub fn call_stub<Marker, F>(f: F, args: &[Value]) -> Result<Value, String>
where
F: EldritchFunction<Marker>,
{
f.call(args)
}

// Helper to get type name (duplicate from utils but avoids public exposure of utils)
fn get_type_name(v: &Value) -> &'static str {
match v {
Expand All @@ -239,45 +226,3 @@ fn get_type_name(v: &Value) -> &'static str {
}
}

// Macro to implement EldritchFunction for tuples of arguments
macro_rules! impl_eldritch_fn {
($($arg:ident),*) => {
#[allow(non_snake_case)]
#[allow(unused_mut)]
#[allow(unused_variables)]
impl<Func, Ret, $($arg),*> EldritchFunction<($($arg,)*)> for Func
where
Func: Fn($($arg),*) -> Ret,
Ret: IntoEldritchResult,
$($arg: FromValue),*
{
fn call(&self, args: &[Value]) -> Result<Value, String> {
// Count args
let expected_len = 0 $( + { let _ = stringify!($arg); 1 } )*;
if args.len() != expected_len {
return Err(format!("Expected {} arguments, got {}", expected_len, args.len()));
}

let mut args_iter = args.iter();
// We use a closure to capture errors during extraction
let res = self(
$(
match $arg::from_value(args_iter.next().unwrap()) {
Ok(v) => v,
Err(e) => return Err(e),
},
)*
);
res.into_eldritch_result()
}
}
}
}

impl_eldritch_fn!();
impl_eldritch_fn!(A);
impl_eldritch_fn!(A, B);
impl_eldritch_fn!(A, B, C);
impl_eldritch_fn!(A, B, C, D);
impl_eldritch_fn!(A, B, C, D, E);
impl_eldritch_fn!(A, B, C, D, E, F);