Unify workspaces (#757)

newpavlov · web-flow · commit 3bd76980b0bb · 2022-03-31T14:19:49.000Z
Also removes all uses of `html_root_url` and relevant notes from Cargo.toml.
diff --git a/.github/workflows/blobby.yml b/.github/workflows/blobby.yml
@@ -32,7 +32,9 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - run: cargo test --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
diff --git a/.github/workflows/block-buffer.yml b/.github/workflows/block-buffer.yml
@@ -36,7 +36,9 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - run: cargo build --release --target ${{ matrix.target }}
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo build --target ${{ matrix.target }}
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -58,5 +60,7 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - run: cargo test --release
-      - run: cargo test --all-features --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
+      - run: cargo test --all-features
diff --git a/.github/workflows/cmov.yml b/.github/workflows/cmov.yml
@@ -42,7 +42,7 @@ jobs:
           target: ${{ matrix.target }}
           override: true
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo build --release --target ${{ matrix.target }}
+      - run: cargo build --target ${{ matrix.target }}
 
   test:
     strategy:
@@ -80,7 +80,7 @@ jobs:
           profile: minimal
           override: true
       - run: ${{ matrix.deps }}
-      - run: cargo test --release
+      - run: cargo test
 
   # Cross-compiled tests
   cross:
@@ -110,4 +110,4 @@ jobs:
           profile: minimal
           override: true
       - uses: RustCrypto/actions/cross-install@master
-      - run: cross test --release --target ${{ matrix.target }}
+      - run: cross test --target ${{ matrix.target }}
diff --git a/.github/workflows/cpufeatures.yml b/.github/workflows/cpufeatures.yml
@@ -50,8 +50,10 @@ jobs:
           target: ${{ matrix.target }}
           override: true
           profile: minimal
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
       - run: ${{ matrix.deps }}
-      - run: cargo test --target ${{ matrix.target }} --release
+      - run: cargo test --target ${{ matrix.target }}
 
   # macOS tests
   macos:
@@ -70,7 +72,9 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           target: x86_64-apple-darwin
           override: true
-      - run: cargo test --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
 
   # Windows tests
   windows:
@@ -93,7 +97,9 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           target: ${{ matrix.target }}
           override: true
-      - run: cargo test --target ${{ matrix.target }} --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test --target ${{ matrix.target }}
 
   # Cross-compiled tests
   cross:
@@ -116,5 +122,7 @@ jobs:
           target: ${{ matrix.target }}
           override: true
           profile: minimal
-      - run: cargo install cross
-      - run: cross test --target ${{ matrix.target }} --release
+      - uses: RustCrypto/actions/cross-install@master
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cross test --target ${{ matrix.target }}
diff --git a/.github/workflows/dbl.yml b/.github/workflows/dbl.yml
@@ -36,7 +36,9 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - run: cargo build --release --target ${{ matrix.target }}
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo build --target ${{ matrix.target }}
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -58,4 +60,6 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - run: cargo test --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
diff --git a/.github/workflows/hex-literal.yml b/.github/workflows/hex-literal.yml
@@ -36,7 +36,9 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - run: cargo build --release --target ${{ matrix.target }}
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo build --target ${{ matrix.target }}
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -58,4 +60,6 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - run: cargo test --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
diff --git a/.github/workflows/opaque-debug.yml b/.github/workflows/opaque-debug.yml
@@ -36,7 +36,9 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - run: cargo build --release --target ${{ matrix.target }}
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo build --target ${{ matrix.target }}
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -58,4 +60,6 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - run: cargo test --release
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
diff --git a/.github/workflows/zeroize.yml b/.github/workflows/zeroize.yml
@@ -38,7 +38,9 @@ jobs:
           target: ${{ matrix.target }}
           override: true
           profile: minimal
-      - run: cargo build --no-default-features --release --target ${{ matrix.target }}
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -64,8 +66,10 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           override: true
           profile: minimal
-      - run: cargo test --release
-      - run: cargo test --release --features alloc,derive
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cargo test
+      - run: cargo test --features alloc,derive
 
   # Feature-gated ARM64 SIMD register support (nightly-only)
   aarch64:
@@ -86,5 +90,7 @@ jobs:
           profile: minimal
           override: true
       - uses: RustCrypto/actions/cross-install@master
-      - run: cross test --release --target ${{ matrix.target }} --features aarch64
-      - run: cross test --release --target ${{ matrix.target }} --all-features
+      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
+      - run: rm ../Cargo.toml
+      - run: cross test --target ${{ matrix.target }} --features aarch64
+      - run: cross test --target ${{ matrix.target }} --all-features
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,13 +2,18 @@
 members = [
     "blobby",
     "block-buffer",
+    "block-padding",
     "collectable",
     "cmov",
     "cpufeatures",
     "dbl",
     "hex-literal",
+    "inout",
     "opaque-debug",
     "wycheproof2blb",
     "zeroize",
     "zeroize/derive"
 ]
+
+[profile.dev]
+opt-level = 2
diff --git a/blobby/Cargo.toml b/blobby/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blobby"
-version = "0.3.1" # Also update html_root_url in lib.rs when bumping this
+version = "0.3.1"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Iterator over simple binary blob storage"
diff --git a/blobby/src/lib.rs b/blobby/src/lib.rs
@@ -46,8 +46,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/blobby/0.3.1"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 extern crate alloc;
 
diff --git a/block-buffer/Cargo.toml b/block-buffer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "block-buffer"
-version = "0.10.2" # Also update html_root_url in lib.rs when bumping this
+version = "0.10.2"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Buffer type for block processing of data"
diff --git a/block-buffer/src/lib.rs b/block-buffer/src/lib.rs
@@ -2,8 +2,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/block-buffer/0.10.2"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 #![warn(missing_docs, rust_2018_idioms)]
 
diff --git a/block-padding/Cargo.toml b/block-padding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "block-padding"
-version = "0.3.2" # Also update html_root_url in lib.rs when bumping this
+version = "0.3.2"
 description = "Padding and unpadding of messages divided into blocks."
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -11,10 +11,6 @@ repository = "https://github.com/RustCrypto/utils"
 keywords = ["padding", "pkcs7", "ansix923", "iso7816"]
 categories = ["cryptography", "no-std"]
 
-# Hack to allow this crate to coexist with pre-2021 edition crates
-[workspace]
-members = ["."]
-
 [dependencies]
 generic-array = "0.14"
 
diff --git a/block-padding/src/lib.rs b/block-padding/src/lib.rs
@@ -6,8 +6,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/block-padding/0.3.2"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![warn(missing_docs, rust_2018_idioms)]
diff --git a/cmov/Cargo.toml b/cmov/Cargo.toml
@@ -13,5 +13,5 @@ repository = "https://github.com/RustCrypto/utils/tree/master/cmov"
 categories = ["cryptography", "hardware-support", "no-std"]
 keywords = ["crypto", "intrinsics"]
 readme = "README.md"
-edition = "2018" # Can't bump to 2021 due to pre-1.56 MSRV crates in the same workspace
+edition = "2021"
 rust-version = "1.59"
diff --git a/collectable/Cargo.toml b/collectable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "collectable"
-version = "0.0.2" # Also update html_root_url in lib.rs when bumping this
+version = "0.0.2"
 authors = ["RustCrypto Developers"]
 license = "Apache-2.0 OR MIT"
 edition = "2018"
diff --git a/collectable/src/lib.rs b/collectable/src/lib.rs
@@ -6,8 +6,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/collectable/0.0.2"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 
 #[cfg(feature = "alloc")]
diff --git a/cpufeatures/Cargo.toml b/cpufeatures/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cpufeatures"
-version = "0.2.2" # Also update html_root_url in lib.rs when bumping this
+version = "0.2.2"
 description = """
 Lightweight runtime CPU feature detection for x86/x86_64 and aarch64 with
 no_std support and support for mobile targets including Android and iOS
diff --git a/dbl/Cargo.toml b/dbl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dbl"
-version = "0.3.2" # Also update html_root_url in lib.rs when bumping this
+version = "0.3.2"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Double operation in Galois Field (GF)"
diff --git a/dbl/src/lib.rs b/dbl/src/lib.rs
@@ -2,8 +2,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/dbl/0.3.2"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 #![forbid(unsafe_code)]
 
diff --git a/hex-literal/Cargo.toml b/hex-literal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hex-literal"
-version = "0.3.4" # Also update html_root_url in lib.rs when bumping this
+version = "0.3.4"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Procedural macro for converting hexadecimal string to byte array at compile time."
diff --git a/hex-literal/src/lib.rs b/hex-literal/src/lib.rs
diff --git a/inout/Cargo.lock b/inout/Cargo.lock
diff --git a/inout/Cargo.toml b/inout/Cargo.toml
diff --git a/inout/src/lib.rs b/inout/src/lib.rs
diff --git a/inout/src/reserved.rs b/inout/src/reserved.rs
diff --git a/opaque-debug/Cargo.toml b/opaque-debug/Cargo.toml
diff --git a/opaque-debug/src/lib.rs b/opaque-debug/src/lib.rs
diff --git a/wycheproof2blb/Cargo.toml b/wycheproof2blb/Cargo.toml
diff --git a/wycheproof2blb/src/main.rs b/wycheproof2blb/src/main.rs
