Refactor examples

Author: gnzlbg

Cargo.toml

@@ -3,6 +3,7 @@ members = [
   "crates/stdsimd-verify",
   "crates/core_arch",
   "crates/std_detect",
+  "examples/"
 ]
 exclude = [
   "crates/wasm-assert-instr-tests"

ci/run.sh

@@ -62,7 +62,7 @@ cargo_test() {
     then
         cmd="$cmd -p core_arch"
     else
-        cmd="$cmd -p core_arch -p std_detect"
+        cmd="$cmd -p core_arch -p std_detect -p stdsimd_examples"
     fi
     cmd="$cmd -- $2"
     if [ "$NORUN" != "1" ]
@@ -109,4 +109,12 @@ case ${TARGET} in
         ;;
     *)
         ;;
+
 esac
+
+# Test examples
+(
+    cd examples
+    cargo test
+    echo test | cargo run --release hex
+)

crates/std_detect/Cargo.toml

@@ -24,26 +24,14 @@ maintenance = { status = "experimental" }
 
 [dependencies]
 libc = "0.2"
-cfg-if = "0.1"
+cfg-if = { version = "^0.1.6", default-features = false }
+rustc-std-workspace-core = { version = "1.0.0", optional = true }
+
+[features]
+default = []
+rustc-dep-of-std = [ 'libc/rustc-dep-of-std', 'rustc-std-workspace-core' ]
 
 [dev-dependencies]
 core_arch = { version = "0.1.3", path = "../core_arch" }
 auxv = "0.3.3"
-quickcheck = "0.8"
-rand = "0.6"
-cupid = "0.6.0"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-rand = { version = "0.6", features = ["wasm-bindgen"] }
-
-[[example]]
-name = "hex"
-path = "../../examples/hex.rs"
-
-[[example]]
-name = "wasm"
-crate-type = ["cdylib"]
-path = "../../examples/wasm.rs"
-
-[features]
-default = []
+cupid = "0.6.0"

crates/std_detect/src/lib.rs

@@ -27,9 +27,10 @@
 #[macro_use(println)]
 extern crate std;
 
+extern crate libc;
+
 #[macro_use]
 extern crate cfg_if;
-extern crate libc;
 
 #[doc(hidden)]
 #[unstable(feature = "stdsimd", issue = "27731")]

examples/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "stdsimd_examples"
+version = "0.0.0"
+authors = [
+    "Alex Crichton <[email protected]>",
+    "Andrew Gallant <[email protected]>",
+    "Gonzalo Brito Gadeschi <[email protected]>",
+]
+description = "Examples of the stdsimd crate."
+
+[dependencies]
+core_arch = { path = "../crates/core_arch" }
+std_detect = { path = "../crates/std_detect" }
+quickcheck = "0.8"
+rand = "0.6"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+rand = { version = "0.6", features = ["wasm-bindgen"] }
+
+[[bin]]
+name = "hex"
+path = "hex.rs"
+
+[[example]]
+name = "wasm"
+crate-type = ["cdylib"]
+path = "wasm.rs"

examples/hex.rs

@@ -8,7 +8,7 @@
 //!
 //! You can test out this program via:
 //!
-//!     echo test | cargo +nightly run --release --example hex -p stdsimd
+//!     echo test | cargo +nightly run --release hex
 //!
 //! and you should see `746573740a` get printed out.
 
@@ -289,8 +289,8 @@ mod benches {
         len: usize,
         f: for<'a> unsafe fn(&[u8], &'a mut [u8]) -> Result<&'a str, usize>,
     ) {
-        let input = rand::thread_rng()
-            .gen_iter::<u8>()
+        let mut rng = rand::thread_rng();
+        let input =  std::iter::repeat(()).map(|()| rng.gen::<u8>())
             .take(len)
             .collect::<Vec<_>>();
         let mut dst = vec![0; input.len() * 2];