Skip to content

Commit 1ed5b12

Browse files
Use the crate name if ext_name is not specified (#472)
1 parent 6ffcc70 commit 1ed5b12

File tree

1 file changed

+4
-3
lines changed
  • crates/duckdb-loadable-macros/src

1 file changed

+4
-3
lines changed

crates/duckdb-loadable-macros/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ pub fn duckdb_entrypoint_c_api(attr: TokenStream, item: TokenStream) -> TokenStr
4545
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()
4646
};
4747

48-
let extension_name = match args.ext_name {
49-
Some(i) => i,
50-
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()
48+
let extension_name = match (args.ext_name, env::var("DUCKDB_EXTENSION_NAME")) {
49+
(Some(i), _) => i,
50+
(None, Ok(i)) => i.to_string(),
51+
_ => env::var("CARGO_PKG_NAME").unwrap().to_string(),
5152
};
5253

5354
let ast = parse_macro_input!(item as syn::Item);

0 commit comments

Comments
 (0)