Merge pull request #859 from newpavlov/patch-3
Fix rand_os
diff --git a/Cargo.toml b/Cargo.toml
index 234e0ee..ef344a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand"
version = "0.7.0"
authors = ["The Rand Project Developers", "The Rust Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/"
diff --git a/rand_chacha/Cargo.toml b/rand_chacha/Cargo.toml
index 9d6989b..6a47b86 100644
--- a/rand_chacha/Cargo.toml
+++ b/rand_chacha/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_chacha"
version = "0.2.1"
authors = ["The Rand Project Developers", "The Rust Project Developers", "The CryptoCorrosion Contributors"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_chacha/"
diff --git a/rand_core/Cargo.toml b/rand_core/Cargo.toml
index 0830fcd..b9042c0 100644
--- a/rand_core/Cargo.toml
+++ b/rand_core/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_core"
version = "0.5.0"
authors = ["The Rand Project Developers", "The Rust Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_core/"
diff --git a/rand_distr/Cargo.toml b/rand_distr/Cargo.toml
index e821985..315a5b0 100644
--- a/rand_distr/Cargo.toml
+++ b/rand_distr/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_distr"
version = "0.2.1"
authors = ["The Rand Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_distr/"
diff --git a/rand_hc/Cargo.toml b/rand_hc/Cargo.toml
index e062935..40cea06 100644
--- a/rand_hc/Cargo.toml
+++ b/rand_hc/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_hc"
version = "0.2.0"
authors = ["The Rand Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_hc/"
diff --git a/rand_isaac/Cargo.toml b/rand_isaac/Cargo.toml
index 5e3bf12..c11c305 100644
--- a/rand_isaac/Cargo.toml
+++ b/rand_isaac/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_isaac"
version = "0.2.0"
authors = ["The Rand Project Developers", "The Rust Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_isaac/"
diff --git a/rand_os/Cargo.toml b/rand_os/Cargo.toml
index 871b52b..6edf27d 100644
--- a/rand_os/Cargo.toml
+++ b/rand_os/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_os"
version = "0.2.1"
authors = ["The Rand Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://docs.rs/rand_os"
diff --git a/rand_pcg/Cargo.toml b/rand_pcg/Cargo.toml
index bfe2a15..e2aa157 100644
--- a/rand_pcg/Cargo.toml
+++ b/rand_pcg/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_pcg"
version = "0.2.0"
authors = ["The Rand Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_pcg/"
diff --git a/rand_xorshift/Cargo.toml b/rand_xorshift/Cargo.toml
index c47bcc9..9cb257b 100644
--- a/rand_xorshift/Cargo.toml
+++ b/rand_xorshift/Cargo.toml
@@ -2,7 +2,7 @@
name = "rand_xorshift"
version = "0.2.0"
authors = ["The Rand Project Developers", "The Rust Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://rust-random.github.io/rand/rand_xorshift/"
diff --git a/rand_xoshiro/CHANGELOG.md b/rand_xoshiro/CHANGELOG.md
index 0edf848..56cb9c2 100644
--- a/rand_xoshiro/CHANGELOG.md
+++ b/rand_xoshiro/CHANGELOG.md
@@ -4,6 +4,9 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.3.1] - 2019-08-06
+- Drop `byteorder`-dependency in favor of `stdlib`-implementation.
+
## [0.3.0] - 2019-06-12
- Bump minor crate version since rand_core bump is a breaking change
- Switch to Edition 2018
diff --git a/rand_xoshiro/Cargo.toml b/rand_xoshiro/Cargo.toml
index 43a5b88..128c213 100644
--- a/rand_xoshiro/Cargo.toml
+++ b/rand_xoshiro/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "rand_xoshiro"
-version = "0.3.0" # NB: When modifying, also modify html_root_url in lib.rs
+version = "0.3.1" # NB: When modifying, also modify html_root_url in lib.rs
authors = ["The Rand Project Developers"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-random/rand"
documentation = "https://docs.rs/rand_xoshiro"
@@ -16,7 +16,6 @@
serde1 = ["serde"]
[dependencies]
-byteorder = { version = "1", default-features=false }
rand_core = { path = "../rand_core", version = "0.5" }
serde = { version = "1", features = ["derive"], optional=true }
diff --git a/rand_xoshiro/src/lib.rs b/rand_xoshiro/src/lib.rs
index b851b9c..3047e92 100644
--- a/rand_xoshiro/src/lib.rs
+++ b/rand_xoshiro/src/lib.rs
@@ -58,7 +58,7 @@
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
html_favicon_url = "https://www.rust-lang.org/favicon.ico",
- html_root_url = "https://docs.rs/rand_xoshiro/0.3.0")]
+ html_root_url = "https://docs.rs/rand_xoshiro/0.3.1")]
#![deny(missing_docs)]
#![deny(missing_debug_implementations)]
diff --git a/rand_xoshiro/src/splitmix64.rs b/rand_xoshiro/src/splitmix64.rs
index 9a29faf..3a41450 100644
--- a/rand_xoshiro/src/splitmix64.rs
+++ b/rand_xoshiro/src/splitmix64.rs
@@ -7,7 +7,6 @@
// except according to those terms.
#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
-use byteorder::{ByteOrder, LittleEndian};
use rand_core::le::read_u64_into;
use rand_core::impls::fill_bytes_via_next;
use rand_core::{RngCore, SeedableRng, Error};
@@ -79,9 +78,7 @@
/// Seed a `SplitMix64` from a `u64`.
fn seed_from_u64(seed: u64) -> SplitMix64 {
- let mut x = [0; 8];
- LittleEndian::write_u64(&mut x, seed);
- SplitMix64::from_seed(x)
+ SplitMix64::from_seed(seed.to_le_bytes())
}
}
diff --git a/tests/wasm_bindgen/Cargo.toml b/tests/wasm_bindgen/Cargo.toml
index eb6ee6f..e83c174 100644
--- a/tests/wasm_bindgen/Cargo.toml
+++ b/tests/wasm_bindgen/Cargo.toml
@@ -4,7 +4,7 @@
version = "0.1.0"
authors = ["The Rand Project Developers"]
publish = false
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
