From 570bf779a38845ba2f57bf204a4156b520898ba9 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 25 May 2024 12:32:11 -0600 Subject: [PATCH] zeroize: move `zeroize_derive` to toplevel The current directory structure unintentionally packages a copy of `zeroize_derive` with every copy of `zeroize`. This commit moves it to the toplevel while making no other changes. This preserves the commit history. --- Cargo.toml | 2 +- zeroize/Cargo.toml | 2 +- {zeroize/derive => zeroize_derive}/CHANGELOG.md | 0 {zeroize/derive => zeroize_derive}/Cargo.toml | 0 {zeroize/derive => zeroize_derive}/LICENSE-APACHE | 0 {zeroize/derive => zeroize_derive}/LICENSE-MIT | 0 {zeroize/derive => zeroize_derive}/README.md | 0 {zeroize/derive => zeroize_derive}/src/lib.rs | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {zeroize/derive => zeroize_derive}/CHANGELOG.md (100%) rename {zeroize/derive => zeroize_derive}/Cargo.toml (100%) rename {zeroize/derive => zeroize_derive}/LICENSE-APACHE (100%) rename {zeroize/derive => zeroize_derive}/LICENSE-MIT (100%) rename {zeroize/derive => zeroize_derive}/README.md (100%) rename {zeroize/derive => zeroize_derive}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 05ba29e9..bb5566d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ members = [ "opaque-debug", "wycheproof2blb", "zeroize", - "zeroize/derive" + "zeroize_derive" ] [profile.dev] diff --git a/zeroize/Cargo.toml b/zeroize/Cargo.toml index fa7252c3..20d34ba9 100644 --- a/zeroize/Cargo.toml +++ b/zeroize/Cargo.toml @@ -19,7 +19,7 @@ rust-version = "1.60" [dependencies] serde = { version = "1.0", default-features = false, optional = true } -zeroize_derive = { version = "1.3", path = "derive", optional = true } +zeroize_derive = { version = "1.3", path = "../zeroize_derive", optional = true } [features] default = ["alloc"] diff --git a/zeroize/derive/CHANGELOG.md b/zeroize_derive/CHANGELOG.md similarity index 100% rename from zeroize/derive/CHANGELOG.md rename to zeroize_derive/CHANGELOG.md diff --git a/zeroize/derive/Cargo.toml b/zeroize_derive/Cargo.toml similarity index 100% rename from zeroize/derive/Cargo.toml rename to zeroize_derive/Cargo.toml diff --git a/zeroize/derive/LICENSE-APACHE b/zeroize_derive/LICENSE-APACHE similarity index 100% rename from zeroize/derive/LICENSE-APACHE rename to zeroize_derive/LICENSE-APACHE diff --git a/zeroize/derive/LICENSE-MIT b/zeroize_derive/LICENSE-MIT similarity index 100% rename from zeroize/derive/LICENSE-MIT rename to zeroize_derive/LICENSE-MIT diff --git a/zeroize/derive/README.md b/zeroize_derive/README.md similarity index 100% rename from zeroize/derive/README.md rename to zeroize_derive/README.md diff --git a/zeroize/derive/src/lib.rs b/zeroize_derive/src/lib.rs similarity index 100% rename from zeroize/derive/src/lib.rs rename to zeroize_derive/src/lib.rs