diff --git a/.github/workflows/cpuid-bool.yml b/.github/workflows/cpufeatures.yml similarity index 86% rename from .github/workflows/cpuid-bool.yml rename to .github/workflows/cpufeatures.yml index eed4ef14..887e7efd 100644 --- a/.github/workflows/cpuid-bool.yml +++ b/.github/workflows/cpufeatures.yml @@ -1,16 +1,16 @@ -name: cpuid-bool +name: cpufeatures on: pull_request: paths: - - "cpuid-bool/**" + - "cpufeatures/**" - "Cargo.*" push: branches: master defaults: run: - working-directory: cpuid-bool + working-directory: cpufeatures env: CARGO_INCREMENTAL: 0 diff --git a/Cargo.lock b/Cargo.lock index bea8fd8b..34c0b35e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,16 +110,16 @@ dependencies = [ "hex-literal 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "cpufeatures" +version = "0.0.0" + [[package]] name = "cpuid-bool" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -[[package]] -name = "cpuid-bool" -version = "0.2.0" - [[package]] name = "crypto-mac" version = "0.10.0" @@ -280,7 +280,7 @@ checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpuid-bool 0.1.2", + "cpuid-bool", "digest", "opaque-debug 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index b8867ee2..96355922 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "block-padding", "collectable", "const-oid", - "cpuid-bool", + "cpufeatures", "dbl", "der", "der/derive", diff --git a/cpuid-bool/CHANGELOG.md b/cpufeatures/CHANGELOG.md similarity index 100% rename from cpuid-bool/CHANGELOG.md rename to cpufeatures/CHANGELOG.md diff --git a/cpuid-bool/Cargo.toml b/cpufeatures/Cargo.toml similarity index 71% rename from cpuid-bool/Cargo.toml rename to cpufeatures/Cargo.toml index d65ec854..d1e75dee 100644 --- a/cpuid-bool/Cargo.toml +++ b/cpufeatures/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "cpuid-bool" -version = "0.2.0" # Also update html_root_url in lib.rs when bumping this +name = "cpufeatures" +version = "0.0.0" # Also update html_root_url in lib.rs when bumping this authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" description = "A lightweight and efficient no-std compatible alternative to the is_x86_feature_detected macro" -documentation = "https://docs.rs/cpuid-bool" +documentation = "https://docs.rs/cpufeatures" repository = "https://github.com/RustCrypto/utils" keywords = ["cpuid", "target-feature"] categories = ["no-std"] diff --git a/cpuid-bool/LICENSE-APACHE b/cpufeatures/LICENSE-APACHE similarity index 100% rename from cpuid-bool/LICENSE-APACHE rename to cpufeatures/LICENSE-APACHE diff --git a/cpuid-bool/LICENSE-MIT b/cpufeatures/LICENSE-MIT similarity index 100% rename from cpuid-bool/LICENSE-MIT rename to cpufeatures/LICENSE-MIT diff --git a/cpuid-bool/src/lib.rs b/cpufeatures/src/lib.rs similarity index 96% rename from cpuid-bool/src/lib.rs rename to cpufeatures/src/lib.rs index c8cb9549..498be3bc 100644 --- a/cpuid-bool/src/lib.rs +++ b/cpufeatures/src/lib.rs @@ -3,7 +3,7 @@ //! # Example //! ``` //! // This macro creates `cpuid_aes_sha` module -//! cpuid_bool::new!(cpuid_aes_sha, "aes", "sha"); +//! cpufeatures::new!(cpuid_aes_sha, "aes", "sha"); //! //! // `token` is a Zero Sized Type value, which guarantees //! // that underlying static storage got properly initialized, @@ -35,7 +35,7 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg", html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg", - html_root_url = "https://docs.rs/cpuid-bool/0.2.0" + html_root_url = "https://docs.rs/cpufeatures/0.0.0" )] #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))] @@ -89,7 +89,7 @@ macro_rules! new { let cr = unsafe { [__cpuid(1), __cpuid_count(7, 0)] }; - let res = $(cpuid_bool::check!(cr, $tf) & )+ true; + let res = $(cpufeatures::check!(cr, $tf) & )+ true; STORAGE.store(res as u8, Relaxed); res } else {