Rename *-getrandom to getrandom-*

This also requires lots of changes to .travis.yml

Signed-off-by: Joe Richey <joerichey@google.com>

Author: josephlr

.travis.yml

@@ -19,7 +19,7 @@ jobs:
       install:
         - rustup target add aarch64-apple-ios
       script:
-        - cargo test --package getrandom --package cpurand-getrandom --tests
+        - cargo test --package getrandom --package getrandom-cpu --tests
         - cargo build --target aarch64-apple-ios
 
     - name: "Linux, beta"
@@ -67,16 +67,16 @@ jobs:
         - cargo web test --target asmjs-unknown-emscripten --no-run
         - cargo test --target wasm32-wasi
         # stdweb (wasm32-unknown-unknown) tests (Node, Chrome)
-        - cargo web test --package stdweb-getrandom
-        - cargo web test --package stdweb-getrandom --nodejs
+        - cargo web test --package getrandom-stdweb
+        - cargo web test --package getrandom-stdweb --nodejs
         # wasm-bindgen (wasm32-unknown-unknown) tests (Node, Firefox, Chrome)
-        - cargo test --package wasm-bindgen-getrandom
+        - cargo test --package getrandom-wasm-bindgen
           --target wasm32-unknown-unknown --test node
         - GECKODRIVER=$HOME/geckodriver
-          cargo test --package wasm-bindgen-getrandom
+          cargo test --package getrandom-wasm-bindgen
           --target wasm32-unknown-unknown --test web
         - CHROMEDRIVER=$HOME/chromedriver
-          cargo test --package wasm-bindgen-getrandom
+          cargo test --package getrandom-wasm-bindgen
           --target wasm32-unknown-unknown --test web
 
     - &nightly_and_docs
@@ -93,13 +93,13 @@ jobs:
         # remove cached documentation, otherwise files from previous PRs can get included
         - rm -rf target/doc
         - cargo doc --no-deps --features=std,custom
-        - cargo doc --no-deps --package cpurand-getrandom
-        - cargo doc --no-deps --package wasm-bindgen-getrandom --target=wasm32-unknown-unknown
+        - cargo doc --no-deps --package getrandom-cpu
+        - cargo doc --no-deps --package getrandom-wasm-bindgen --target=wasm32-unknown-unknown
         - cargo deadlinks --dir target/doc
         # Check that our tests pass in the default/minimal configuration
-        - cargo test --package getrandom --package cpurand-getrandom --tests --benches
+        - cargo test --package getrandom --package getrandom-cpu --tests --benches
         - cargo generate-lockfile -Z minimal-versions
-        - cargo test --package getrandom --package cpurand-getrandom --tests --benches
+        - cargo test --package getrandom --package getrandom-cpu --tests --benches
 
     - <<: *nightly_and_docs
       name: "OSX, nightly, docs"
@@ -132,18 +132,18 @@ jobs:
         # As all of the targets here are x86, it is enough to test that
         # getrandom and getrandom-cpu build for all x86 targets.
         - for TARGET in ${STD_TARGETS[@]}; do
-            cargo build --package cpurand-getrandom --target $TARGET;
+            cargo build --package getrandom-cpu --target $TARGET;
           done
         - for TARGET in ${NO_STD_TARGETS[@]}; do
-            cargo xbuild --package cpurand-getrandom --target $TARGET;
+            cargo xbuild --package getrandom-cpu --target $TARGET;
           done
         # Also check that minimum versions build
         - cargo generate-lockfile -Z minimal-versions
         - for TARGET in ${STD_TARGETS[@]}; do
-            cargo build --package cpurand-getrandom --target $TARGET;
+            cargo build --package getrandom-cpu --target $TARGET;
           done
         - for TARGET in ${NO_STD_TARGETS[@]}; do
-            cargo xbuild --package cpurand-getrandom --target $TARGET;
+            cargo xbuild --package getrandom-cpu --target $TARGET;
           done
 
     # Trust cross-built/emulated targets. We must repeat all non-default values.
@@ -188,7 +188,7 @@ before_script:
   - export RUSTFLAGS="-D warnings"
 
 script:
-  - cargo test --package getrandom --package cpurand-getrandom --tests
+  - cargo test --package getrandom --package getrandom-cpu --tests
 
 after_script: set +e
 

Cargo.toml

@@ -16,7 +16,7 @@ appveyor = { repository = "rust-random/getrandom" }
 
 [workspace]
 members = [
-    "custom/cpurand",
+    "custom/cpu",
     "custom/stdweb",
     "custom/wasm-bindgen",
 ]

custom/cpurand/Cargo.toml custom/cpu/Cargo.tomlcustom/cpurand/Cargo.toml renamed to custom/cpu/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "cpurand-getrandom"
+name = "getrandom-cpu"
 version = "0.1.0"
 edition = "2018"
 authors = ["The Rand Project Developers"]
 license = "MIT OR Apache-2.0"
 description = "Custom shim for using getrandom with CPU RNG instructions"
-documentation = "https://docs.rs/cpurand-getrandom"
+documentation = "https://docs.rs/getrandom-cpu"
 repository = "https://github.com/rust-random/getrandom"
 categories = ["hardware-support", "no-std"]
 

custom/cpurand/src/lib.rs custom/cpu/src/lib.rscustom/cpurand/src/lib.rs renamed to custom/cpu/src/lib.rs

@@ -1,4 +1,4 @@
 // Call cpurand so that it will be invoked on std targets (like Linux).
-use cpurand_getrandom::cpurand as getrandom;
+use getrandom_cpu::cpurand as getrandom;
 #[path = "../../../tests/common/mod.rs"]
 mod common;

custom/cpurand/tests/cpurand.rs custom/cpu/tests/cpurand.rscustom/cpurand/tests/cpurand.rs renamed to custom/cpu/tests/cpurand.rs

@@ -1,5 +1,5 @@
 // Explicitly use the Custom RNG crate to link it in.
-use cpurand_getrandom;
+use getrandom_cpu;
 
 use getrandom::getrandom;
 #[path = "../../../tests/common/mod.rs"]

custom/cpurand/tests/normal.rs custom/cpu/tests/normal.rscustom/cpurand/tests/normal.rs renamed to custom/cpu/tests/normal.rs

@@ -1,11 +1,11 @@
 [package]
-name = "stdweb-getrandom"
+name = "getrandom-stdweb"
 version = "0.1.0"
 edition = "2018"
 authors = ["The Rand Project Developers"]
 license = "MIT OR Apache-2.0"
 description = "Custom shim for using getrandom with stdweb"
-documentation = "https://docs.rs/stdweb-getrandom"
+documentation = "https://docs.rs/getrandom-stdweb"
 repository = "https://github.com/rust-random/getrandom"
 categories = ["wasm"]
 

custom/stdweb/Cargo.toml

@@ -1,5 +1,5 @@
 // Explicitly use the Custom RNG crate to link it in.
-use stdweb_getrandom;
+use getrandom_stdweb;
 
 use getrandom::getrandom;
 use test;

custom/stdweb/tests/test.rs

@@ -1,11 +1,11 @@
 [package]
-name = "wasm-bindgen-getrandom"
+name = "getrandom-wasm-bindgen"
 version = "0.1.0"
 edition = "2018"
 authors = ["The Rand Project Developers"]
 license = "MIT OR Apache-2.0"
 description = "Custom shim for using getrandom with wasm-bindgen"
-documentation = "https://docs.rs/wasm-bindgen-getrandom"
+documentation = "https://docs.rs/getrandom-wasm-bindgen"
 repository = "https://github.com/rust-random/getrandom"
 categories = ["wasm"]
 

custom/wasm-bindgen/Cargo.toml

@@ -1,5 +1,5 @@
 // Explicitly use the Custom RNG crate to link it in.
-use wasm_bindgen_getrandom;
+use getrandom_wasm_bindgen;
 
 use getrandom::getrandom;
 use wasm_bindgen_test::wasm_bindgen_test as test;