Move async-signature and signature-derive to toplevel

These crates were previously nested under `signature/async` and `signature/derive`, which complicates tooling that expects crates to be in toplevel directories, and as things currently stand also meant that releases of the `signature` crate accidentally included stale copies of the other two crates. This commit moves them to toplevel `async-signature` and `signature-derive` directories.
RustCrypto · Nov 12, 2023 · fc5caa8 · fc5caa8
1 parent c4cd5eb
commit fc5caa8
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/async-signature.yml b/.github/workflows/async-signature.yml
@@ -3,14 +3,15 @@ name: async-signature
 on:
   pull_request:
     paths:
+      - "async-signature/**"
       - "signature/**"
       - "Cargo.*"
   push:
     branches: master
 
 defaults:
   run:
-    working-directory: signature/async
+    working-directory: async-signature
 
 env:
   CARGO_INCREMENTAL: 0
@@ -43,5 +44,5 @@ jobs:
       - run: cargo update -Z minimal-versions
       - uses: dtolnay/rust-toolchain@stable
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: rm ../../Cargo.toml
+      - run: rm ../Cargo.toml
       - run: cargo hack test --release --feature-powerset
diff --git a/.github/workflows/signature.yml b/.github/workflows/signature.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - "signature/**"
+      - "signature-derive/**"
       - "Cargo.*"
   push:
     branches: master

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "aead",
+    "async-signature",
     "cipher",
     "crypto",
     "crypto-common",
@@ -10,7 +11,7 @@ members = [
     "kem",
     "password-hash",
     "signature",
-    "signature/async",
+    "signature-derive",
     "universal-hash",
 ]
 

diff --git a/signature/async/CHANGELOG.md → async-signature/CHANGELOG.md b/signature/async/CHANGELOG.md → async-signature/CHANGELOG.md
diff --git a/signature/async/Cargo.toml → async-signature/Cargo.toml b/signature/async/Cargo.toml → async-signature/Cargo.toml
@@ -5,7 +5,7 @@ version       = "0.4.0-pre"
 authors       = ["RustCrypto Developers"]
 license       = "Apache-2.0 OR MIT"
 documentation = "https://docs.rs/async-signature"
-repository    = "https://github.com/RustCrypto/traits/tree/master/signature/async"
+repository    = "https://github.com/RustCrypto/traits/tree/master/async-signature"
 readme        = "README.md"
 keywords      = ["crypto", "ecdsa", "ed25519", "signature", "signing"]
 categories    = ["cryptography", "no-std"]
@@ -14,7 +14,7 @@ rust-version  = "1.60"
 
 [dependencies]
 async-trait = "0.1.9"
-signature = { version = "=2.2.0-pre", path = ".." }
+signature = ">= 2.0, <2.3"
 
 [features]
 digest = ["signature/digest"]

diff --git a/signature/async/LICENSE-APACHE → async-signature/LICENSE-APACHE b/signature/async/LICENSE-APACHE → async-signature/LICENSE-APACHE
diff --git a/signature/async/LICENSE-MIT → async-signature/LICENSE-MIT b/signature/async/LICENSE-MIT → async-signature/LICENSE-MIT
diff --git a/signature/async/README.md → async-signature/README.md b/signature/async/README.md → async-signature/README.md
diff --git a/signature/async/src/lib.rs → async-signature/src/lib.rs b/signature/async/src/lib.rs → async-signature/src/lib.rs
diff --git a/signature/derive/CHANGELOG.md → signature-derive/CHANGELOG.md b/signature/derive/CHANGELOG.md → signature-derive/CHANGELOG.md
diff --git a/signature/derive/Cargo.toml → signature-derive/Cargo.toml b/signature/derive/Cargo.toml → signature-derive/Cargo.toml
@@ -5,7 +5,7 @@ authors       = ["RustCrypto Developers"]
 license       = "Apache-2.0 OR MIT"
 description   = "Custom derive support for the 'signature' crate"
 documentation = "https://docs.rs/signature"
-repository    = "https://github.com/RustCrypto/traits/tree/master/signature/derive"
+repository    = "https://github.com/RustCrypto/traits/tree/master/signature-derive"
 readme        = "README.md"
 edition       = "2021"
 rust-version  = "1.56"

diff --git a/signature/derive/LICENSE-APACHE → signature-derive/LICENSE-APACHE b/signature/derive/LICENSE-APACHE → signature-derive/LICENSE-APACHE
diff --git a/signature/derive/LICENSE-MIT → signature-derive/LICENSE-MIT b/signature/derive/LICENSE-MIT → signature-derive/LICENSE-MIT
diff --git a/signature/derive/README.md → signature-derive/README.md b/signature/derive/README.md → signature-derive/README.md
diff --git a/signature/derive/src/lib.rs → signature-derive/src/lib.rs b/signature/derive/src/lib.rs → signature-derive/src/lib.rs
diff --git a/signature/Cargo.toml b/signature/Cargo.toml
@@ -13,7 +13,7 @@ edition       = "2021"
 rust-version  = "1.60"
 
 [dependencies]
-derive = { package = "signature_derive", version = "2", optional = true, path = "derive" }
+derive = { package = "signature_derive", version = "2", optional = true, path = "../signature-derive" }
 digest = { version = "0.10.6", optional = true, default-features = false }
 rand_core = { version = "0.6.4", optional = true, default-features = false }