From c6a5e7a82d612269a6705885eee57cff53515582 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 12 Feb 2025 14:05:15 -0700 Subject: [PATCH] Bump to 0.3.1 and update manifests --- Cargo.lock | 2 +- Cargo.toml | 1 + codegen/Cargo.toml | 3 +-- ctor/Cargo.toml | 4 ++-- ctor/src/lib.rs | 2 +- tests-wasm/Cargo.toml | 1 + tests/Cargo.toml | 3 +-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b83715..9dea49e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ctor" -version = "0.3.0" +version = "0.3.1" dependencies = [ "libc-print", ] diff --git a/Cargo.toml b/Cargo.toml index ebf620f..d1622e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,3 @@ [workspace] members = [ "ctor", "codegen", "dtor", "tests", "tests-wasm" ] +resolver = "2" diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index 76d8919..01889cb 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "ctor-codegen" version = "0.1.0" -authors = ["Matt Mastracci "] -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/ctor/Cargo.toml b/ctor/Cargo.toml index eb5aaba..90f1b79 100644 --- a/ctor/Cargo.toml +++ b/ctor/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "ctor" -version = "0.3.0" +version = "0.3.1" authors = ["Matt Mastracci "] -edition = "2018" +edition = "2021" description = "__attribute__((constructor)) for Rust" license = "Apache-2.0 OR MIT" repository = "https://github.com/mmastrac/rust-ctor" diff --git a/ctor/src/lib.rs b/ctor/src/lib.rs index 888cf0d..0eb6cde 100644 --- a/ctor/src/lib.rs +++ b/ctor/src/lib.rs @@ -243,7 +243,7 @@ fn generate(name: &str, ctor_type: &str, item: TokenStream) -> TokenStream { ]), )), ]); - macro_inner.extend(item.into_iter()); + macro_inner.extend(item); TokenStream::from_iter([ T::Ident(Ident::new(¯os_name, Span::call_site())), diff --git a/tests-wasm/Cargo.toml b/tests-wasm/Cargo.toml index e34dd19..3dcf8ff 100644 --- a/tests-wasm/Cargo.toml +++ b/tests-wasm/Cargo.toml @@ -2,6 +2,7 @@ name = "tests-wasm" version = "0.1.0" edition = "2021" +publish = false [lib] crate-type = ["cdylib"] diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 8fa8de9..000ce27 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "tests" version = "0.1.0" -authors = ["Matt Mastracci "] -edition = "2018" +edition = "2021" publish = false [features]