Skip to content

Commit 897cd67

Browse files
authored
fix: correct generated function name (#245)
* fix: correct generated function name * chore: satify clippy remove dud enumerate call
1 parent 0277fb3 commit 897cd67

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

duckdb-loadable-macros/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![allow(clippy::redundant_clone)]
2-
use proc_macro2::Ident;
2+
use proc_macro2::{Ident, Span};
33

44
use syn::{parse_macro_input, spanned::Spanned, Item};
55

@@ -13,6 +13,10 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
1313
match ast {
1414
Item::Fn(mut func) => {
1515
let c_entrypoint = func.sig.ident.clone();
16+
let c_entrypoint_version = Ident::new(
17+
c_entrypoint.to_string().replace("_init", "_version").as_str(),
18+
Span::call_site(),
19+
);
1620

1721
let original_funcname = func.sig.ident.to_string();
1822
func.sig.ident = Ident::new(format!("_{}", original_funcname).as_str(), func.sig.ident.span());
@@ -35,7 +39,7 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
3539
///
3640
/// Predefined function, don't need to change unless you are sure
3741
#[no_mangle]
38-
pub unsafe extern "C" fn libhello_ext_version() -> *const c_char {
42+
pub unsafe extern "C" fn #c_entrypoint_version() -> *const c_char {
3943
ffi::duckdb_library_version()
4044
}
4145

src/vtab/excel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl VTab for ExcelVTab {
5353
for data in rows.by_ref() {
5454
// find the first row with no empty cell
5555
let mut found = true;
56-
for (_, cell) in data.iter().enumerate() {
56+
for cell in data.iter() {
5757
match cell {
5858
DataType::Error(_) | DataType::Empty => {
5959
found = false;

0 commit comments

Comments
 (0)