diff --git a/Cargo.lock b/Cargo.lock index 1ef9b46..705496a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -242,30 +242,24 @@ dependencies = [ [[package]] name = "ctor" -version = "0.4.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6" +checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98" dependencies = [ - "ctor-proc-macro 0.0.6", - "dtor 0.0.6", + "ctor-proc-macro", + "dtor", ] [[package]] name = "ctor" -version = "0.8.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98" +checksum = "5c24d2b2b7c12a2fffb7c5c8fd0dcda7ca14b4600fa2d3701b6079aefb6fa180" dependencies = [ - "ctor-proc-macro 0.0.7", - "dtor 0.3.0", + "link-section", + "linktime-proc-macro", ] -[[package]] -name = "ctor-proc-macro" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" - [[package]] name = "ctor-proc-macro" version = "0.0.7" @@ -310,30 +304,15 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "dtor" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8" -dependencies = [ - "dtor-proc-macro 0.0.5", -] - [[package]] name = "dtor" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4" dependencies = [ - "dtor-proc-macro 0.0.6", + "dtor-proc-macro", ] -[[package]] -name = "dtor-proc-macro" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" - [[package]] name = "dtor-proc-macro" version = "0.0.6" @@ -629,6 +608,18 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +[[package]] +name = "link-section" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4641b91711debb59c61b07eb5e30521ed6d9e2bdd9fd04f934e7da3a5bc386d4" + +[[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" version = "0.12.1" @@ -1258,7 +1249,7 @@ dependencies = [ "bumpalo", "clap", "color-eyre", - "ctor 0.4.3", + "ctor 1.0.3", "either", "interpreter", "memchr", diff --git a/Cargo.toml b/Cargo.toml index cec0bb2..ff19895 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ tracing-error = "0.2.1" clap = { version = "4.6.1", features = ["derive"] } [dev-dependencies] -ctor = "0.4" +ctor = "1.0" uutests = "0.8" [profile.release] diff --git a/tests/awk.rs b/tests/awk.rs index e216261..c3adb70 100644 --- a/tests/awk.rs +++ b/tests/awk.rs @@ -9,7 +9,7 @@ use uutests::util::TestScenario; pub const TESTS_BINARY: &str = env!("CARGO_BIN_EXE_awk"); -#[ctor::ctor] +#[ctor::ctor(unsafe)] fn init() { unsafe { env::set_var("UUTESTS_BINARY_PATH", TESTS_BINARY);