Merge pull request #756 from amethyst/bump

Bump shred to 0.14.0
amethyst · Jul 18, 2022 · 81073f3 · 81073f3
2 parents 7b1f519 + 6b53101
commit 81073f3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        toolchain: [stable, beta, nightly]
+        toolchain: [stable, beta, nightly, 1.60.0]
     steps:
       - uses: actions/checkout@v2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# Unreleased
+# 0.19.0 (2022-07-15)
+
+* Bump shred to version `0.14.1`, MSRV to 1.60.0 ([shred changelog][shred-changelog], [#756])
+
+[#756]: https://github.com/amethyst/specs/pull/756
 
 # 0.18.0 (2022-07-02)
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "specs"
-version = "0.18.0"
+version = "0.19.0"
 description = """
 Specs is an Entity-Component-System library written in Rust.
 """
@@ -12,21 +12,19 @@ keywords = ["gamedev", "ecs", "entity", "component"]
 categories = ["concurrency", "game-engines"]
 license = "MIT OR Apache-2.0"
 authors = ["slide-rs hackers"]
-exclude = ["bors.toml", ".travis.yml"]
-edition = "2018"
+include = ["src", "README.md", "LICENSE-MIT", "LICENSE-APACHE"]
+edition = "2021"
+rust-version = "1.60.0"
 
 # the `storage_cmp` and `storage_sparse` benches are called from `benches_main`
 autobenches = false
 
-[badges]
-travis-ci = { repository = "slide-rs/specs" }
-
 [dependencies]
+ahash = "0.7.6"
 crossbeam-queue = "0.3"
-hashbrown = "0.12"
 hibitset = { version = "0.6.3", default-features = false }
 log = "0.4.8"
-shred = { version = "0.13", default-features = false }
+shred = { version = "0.14.1", default-features = false }
 shrev = "1.1.1"
 tuple_utils = "0.4.0"
 
@@ -37,7 +35,7 @@ uuid = { version = "1.0", optional = true, features = ["v4", "serde"] }
 
 [features]
 default = ["parallel"]
-parallel = ["rayon", "shred/parallel", "hibitset/parallel"]
+parallel = ["dep:rayon", "shred/parallel", "hibitset/parallel"]
 uuid_entity = ["uuid", "serde"]
 stdweb = ["uuid/js"]
 storage-event-control = []
@@ -55,7 +53,7 @@ criterion = "0.3.1"
 ron = "0.7.1"
 rand = "0.8"
 serde_json = "1.0.48"
-shred = { version = "0.13.0", default-features = false, features = ["shred-derive"] }
+shred = { version = "0.14.1", default-features = false, features = ["shred-derive"] }
 specs-derive = { path = "specs-derive", version = "0.4.1" }
 
 [[example]]

diff --git a/clippy.toml b/clippy.toml
@@ -0,0 +1 @@
+disallowed-types = ["std::collections::HashMap"]
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,5 @@
 #![warn(missing_docs)]
+#![deny(clippy::disallowed_types)]
 #![cfg_attr(
     feature = "nightly",
     feature(generic_associated_types, associated_type_defaults)

diff --git a/src/storage/storages.rs b/src/storage/storages.rs
@@ -2,7 +2,7 @@
 
 use std::{collections::BTreeMap, mem::MaybeUninit};
 
-use hashbrown::HashMap;
+use ahash::AHashMap as HashMap;
 use hibitset::BitSetLike;
 
 use crate::{
@@ -66,7 +66,7 @@ unsafe impl<T> DistinctStorage for BTreeStorage<T> {}
 
 /// `HashMap`-based storage. Best suited for rare components.
 ///
-/// This uses the [hashbrown::HashMap] internally.
+/// This uses the [std::collections::HashMap] internally.
 pub struct HashMapStorage<T>(HashMap<Index, T>);
 
 impl<T> Default for HashMapStorage<T> {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		disallowed-types = ["std::collections::HashMap"]