diff --git a/Cargo.lock b/Cargo.lock index 833839d57e3f1..e2cf48002bdb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,7 +112,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -123,7 +123,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1581,21 +1581,14 @@ dependencies = [ [[package]] name = "ctor" -version = "0.10.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cf0d42651b16c6dfe68685716d18480d18a9c39c62d76e8cf3eb6ed5d8bcbf" +checksum = "f7335955a5f85f95f3188623240e081e7b2059a8ad1bae68944b7cfdd718fb10" dependencies = [ - "ctor-proc-macro", - "dtor", "link-section", + "linktime-proc-macro", ] -[[package]] -name = "ctor-proc-macro" -version = "0.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a949c44fcacbbbb7ada007dc7acb34603dd97cd47de5d054f2b6493ecebb483" - [[package]] name = "ctutils" version = "0.4.2" @@ -2713,7 +2706,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2744,21 +2737,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "dtor" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf234dd1594d6dd434a8fb8cada51ddbbc593e40e4a01556a0b31c62da2775b" -dependencies = [ - "dtor-proc-macro", -] - -[[package]] -name = "dtor-proc-macro" -version = "0.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2647271c92754afcb174e758003cfd1cbf1e43e5a7853d7b1813e63e19e39a73" - [[package]] name = "dunce" version = "1.0.5" @@ -2857,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3944,9 +3922,15 @@ dependencies = [ [[package]] name = "link-section" -version = "0.2.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b685d66585d646efe09fec763d796c291049c8b6bf84e04954bffc8748341f0d" +checksum = "ea2c24837c4fd5ab6a31d64133eae954f5199247523cf29586117e85245c0dd3" + +[[package]] +name = "linktime-proc-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44cd706ff0d503ee32b2071166510ca27e281228de10cd3aa8d35ff94560f81" [[package]] name = "linux-raw-sys" @@ -4119,7 +4103,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4868,7 +4852,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -5249,7 +5233,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5711,7 +5695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5812,7 +5796,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5982,7 +5966,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6900,7 +6884,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 37734211266ba..edf186f964100 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,7 +118,7 @@ bytes = "1.11" bzip2 = "0.6.1" chrono = { version = "0.4.44", default-features = false } criterion = "0.8" -ctor = "0.10.0" +ctor = "1.0.1" dashmap = "6.0.1" datafusion = { path = "datafusion/core", version = "53.1.0", default-features = false } datafusion-catalog = { path = "datafusion/catalog", version = "53.1.0" } diff --git a/datafusion-cli/tests/cli_integration.rs b/datafusion-cli/tests/cli_integration.rs index be4a2ad4fe197..5609591268539 100644 --- a/datafusion-cli/tests/cli_integration.rs +++ b/datafusion-cli/tests/cli_integration.rs @@ -121,7 +121,7 @@ async fn setup_minio_container() -> Result, String> } #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for tests let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/core_integration.rs b/datafusion/core/tests/core_integration.rs index 99783427f022e..f85538b5c3405 100644 --- a/datafusion/core/tests/core_integration.rs +++ b/datafusion/core/tests/core_integration.rs @@ -64,7 +64,7 @@ mod tracing; mod extension_types; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/fuzz.rs b/datafusion/core/tests/fuzz.rs index 5e94f12b5805d..9987721318f83 100644 --- a/datafusion/core/tests/fuzz.rs +++ b/datafusion/core/tests/fuzz.rs @@ -22,7 +22,7 @@ mod fuzz_cases; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/memory_limit/mod.rs b/datafusion/core/tests/memory_limit/mod.rs index 90459960c5561..90df245718db7 100644 --- a/datafusion/core/tests/memory_limit/mod.rs +++ b/datafusion/core/tests/memory_limit/mod.rs @@ -63,7 +63,7 @@ use futures::StreamExt; use tokio::fs::File; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/optimizer/mod.rs b/datafusion/core/tests/optimizer/mod.rs index a461c6f6c5962..c8208ef3efa90 100644 --- a/datafusion/core/tests/optimizer/mod.rs +++ b/datafusion/core/tests/optimizer/mod.rs @@ -47,7 +47,7 @@ use datafusion_expr::expr_rewriter::rewrite_with_guarantees; use datafusion_functions::datetime; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // enable logging so RUST_LOG works let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/parquet/mod.rs b/datafusion/core/tests/parquet/mod.rs index e96bd49b9ace9..0e936a79ebe9f 100644 --- a/datafusion/core/tests/parquet/mod.rs +++ b/datafusion/core/tests/parquet/mod.rs @@ -60,7 +60,7 @@ mod schema_coercion; mod utils; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/core/tests/user_defined_integration.rs b/datafusion/core/tests/user_defined_integration.rs index 4f9cc89529adb..fa11e32cc58c4 100644 --- a/datafusion/core/tests/user_defined_integration.rs +++ b/datafusion/core/tests/user_defined_integration.rs @@ -19,7 +19,7 @@ mod user_defined; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs index 92e6b13330c19..c0d2187d9425b 100644 --- a/datafusion/expr/src/lib.rs +++ b/datafusion/expr/src/lib.rs @@ -139,7 +139,7 @@ pub use udwf::{LimitEffect, ReversedUDWF, WindowUDF, WindowUDFImpl}; pub use window_frame::{WindowFrame, WindowFrameBound, WindowFrameUnits}; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/functions/src/lib.rs b/datafusion/functions/src/lib.rs index b9ce113efa627..7e753d7f35eb3 100644 --- a/datafusion/functions/src/lib.rs +++ b/datafusion/functions/src/lib.rs @@ -193,7 +193,7 @@ pub fn register_all(registry: &mut dyn FunctionRegistry) -> Result<()> { } #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/optimizer/src/lib.rs b/datafusion/optimizer/src/lib.rs index e610091824092..9e469689c8f90 100644 --- a/datafusion/optimizer/src/lib.rs +++ b/datafusion/optimizer/src/lib.rs @@ -84,7 +84,7 @@ pub(crate) mod join_key_set; mod plan_signature; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for test let _ = env_logger::try_init(); diff --git a/datafusion/optimizer/tests/optimizer_integration.rs b/datafusion/optimizer/tests/optimizer_integration.rs index 14e02c8693b2a..e61e6467930e6 100644 --- a/datafusion/optimizer/tests/optimizer_integration.rs +++ b/datafusion/optimizer/tests/optimizer_integration.rs @@ -48,7 +48,7 @@ use datafusion_sql::sqlparser::parser::Parser; use insta::assert_snapshot; #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // enable logging so RUST_LOG works let _ = env_logger::try_init(); diff --git a/datafusion/sql/tests/sql_integration.rs b/datafusion/sql/tests/sql_integration.rs index 724057318ca40..ba061d474ba0e 100644 --- a/datafusion/sql/tests/sql_integration.rs +++ b/datafusion/sql/tests/sql_integration.rs @@ -4966,7 +4966,7 @@ fn assert_field_not_found(mut err: DataFusionError, name: &str) { } #[cfg(test)] -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { // Enable RUST_LOG logging configuration for tests let _ = env_logger::try_init();