From cd83ac6146e56d603898f672c9c32efd697efe1e Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Wed, 5 Feb 2025 16:14:21 -0500 Subject: [PATCH] Remove error from vcursor trait in extensions --- extensions/core/src/lib.rs | 4 ---- extensions/series/src/lib.rs | 10 ---------- macros/src/lib.rs | 3 --- 3 files changed, 17 deletions(-) diff --git a/extensions/core/src/lib.rs b/extensions/core/src/lib.rs index 805051079..22d90f572 100644 --- a/extensions/core/src/lib.rs +++ b/extensions/core/src/lib.rs @@ -115,10 +115,6 @@ pub trait VTabCursor: Sized { fn column(&self, idx: u32) -> Value; fn eof(&self) -> bool; fn next(&mut self) -> ResultCode; - fn set_error(&mut self, error: Self::Error); - fn error(&self) -> Option { - None - } } #[repr(C)] diff --git a/extensions/series/src/lib.rs b/extensions/series/src/lib.rs index 9732c909d..83dd334ea 100644 --- a/extensions/series/src/lib.rs +++ b/extensions/series/src/lib.rs @@ -40,7 +40,6 @@ impl VTabModule for GenerateSeriesVTab { stop: 0, step: 0, current: 0, - error: None, } } @@ -85,7 +84,6 @@ struct GenerateSeriesCursor { stop: i64, step: i64, current: i64, - error: Option, } impl VTabCursor for GenerateSeriesCursor { @@ -114,14 +112,6 @@ impl VTabCursor for GenerateSeriesCursor { } } - fn error(&self) -> Option { - self.error - } - - fn set_error(&mut self, err: ResultCode) { - self.error = Some(err); - } - fn rowid(&self) -> i64 { ((self.current - self.start) / self.step) + 1 } diff --git a/macros/src/lib.rs b/macros/src/lib.rs index 2c88776f7..632b95615 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -463,9 +463,6 @@ pub fn derive_vtab_module(input: TokenStream) -> TokenStream { return ::limbo_ext::Value::error(ResultCode::Error); } let cursor = unsafe { &mut *(cursor as *mut <#struct_name as ::limbo_ext::VTabModule>::VCursor) }; - if let Some(err) = <#struct_name as ::limbo_ext::VTabModule>::VCursor::error(cursor) { - return ::limbo_ext::Value::error_with_message(err.to_string()); - } <#struct_name as ::limbo_ext::VTabModule>::column(cursor, idx) }