From df8a769f0914403bb2246a7c3706a8f5834f5e2a Mon Sep 17 00:00:00 2001 From: Hiroaki Yutani Date: Thu, 20 Mar 2025 12:11:25 +0900 Subject: [PATCH] Use the crate name if ext_name is not specified --- crates/duckdb-loadable-macros/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/duckdb-loadable-macros/src/lib.rs b/crates/duckdb-loadable-macros/src/lib.rs index 44c23691..bacd5b6a 100644 --- a/crates/duckdb-loadable-macros/src/lib.rs +++ b/crates/duckdb-loadable-macros/src/lib.rs @@ -45,9 +45,10 @@ pub fn duckdb_entrypoint_c_api(attr: TokenStream, item: TokenStream) -> TokenStr None => env::var("DUCKDB_EXTENSION_MIN_DUCKDB_VERSION").expect("Please either set env var DUCKDB_EXTENSION_MIN_DUCKDB_VERSION or pass it as an argument to the proc macro").to_string() }; - let extension_name = match args.ext_name { - Some(i) => i, - None => env::var("DUCKDB_EXTENSION_NAME").expect("Please either set env var DUCKDB_EXTENSION_MIN_DUCKDB_VERSION or pass it as an argument to the proc macro").to_string() + let extension_name = match (args.ext_name, env::var("DUCKDB_EXTENSION_NAME")) { + (Some(i), _) => i, + (None, Ok(i)) => i.to_string(), + _ => env::var("CARGO_PKG_NAME").unwrap().to_string(), }; let ast = parse_macro_input!(item as syn::Item);