Merge branch 'master' into update-deps

Author: Chojan Shang

.github/workflows/rust.yml

@@ -0,0 +1,98 @@
+name: Rust
+
+on:
+  push:
+    branches-ignore:
+      - trying.tmp
+      - staging.tmp
+  pull_request:
+
+jobs:
+  miri:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - env:
+        TARGET: x86_64-unknown-linux-gnu
+      run: sh ci/miri.sh
+
+  rustfmt_clippy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - env:
+        TARGET: i586-unknown-linux-gnu
+      run: sh ci/tools.sh
+
+  test:
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.channel }}
+        override: true
+    - env:
+        TARGET: ${{ matrix.target }}
+        CHANNEL: ${{ matrix.channel }}
+        CROSS: ${{ matrix.target != 'x86_64-unknown-linux-gnu' && '1' || '0' }}
+        NO_STD: ${{ matrix.target == 'thumbv6m-none-eabi' && '1' || '0' }}
+      run: sh ci/run.sh
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        target: [
+          x86_64-unknown-linux-gnu,
+          i686-unknown-linux-gnu,
+          i586-unknown-linux-gnu,
+          armv7-unknown-linux-gnueabihf,
+          aarch64-unknown-linux-gnu,
+          thumbv6m-none-eabi,
+          x86_64-pc-windows-gnu,
+        ]
+        channel: [1.49.0, nightly]
+        include:
+        - os: macos-latest
+          target: x86_64-apple-darwin
+          channel: nightly
+        - os: windows-latest
+          target: x86_64-pc-windows-msvc
+          channel: nightly
+        - os: macos-latest
+          target: x86_64-apple-darwin
+          channel: 1.49.0
+        - os: windows-latest
+          target: x86_64-pc-windows-msvc
+          channel: 1.49.0
+        - os: ubuntu-latest
+          target: x86_64-unknown-linux-gnu
+          channel: beta
+        - os: ubuntu-latest
+          target: x86_64-unknown-linux-gnu
+          channel: stable
+
+  # These jobs doesn't actually test anything, but they're only used to tell
+  # bors the build completed, as there is no practical way to detect when a
+  # workflow is successful listening to webhooks only.
+  #
+  # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
+
+  end-success:
+    name: bors build finished
+    if: github.event.pusher.name == 'bors' && success()
+    runs-on: ubuntu-latest
+    needs: [miri, rustfmt_clippy, test]
+
+    steps:
+      - name: Mark the job as successful
+        run: exit 0
+
+  end-failure:
+    name: bors build finished
+    if: github.event.pusher.name == 'bors' && (failure() || cancelled())
+    runs-on: ubuntu-latest
+    needs: [miri, rustfmt_clippy, test]
+
+    steps:
+      - name: Mark the job as a failure
+        run: exit 1

.travis.yml

@@ -2,8 +2,8 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](https://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 

CHANGELOG.md

@@ -8,7 +8,7 @@ repository = "https://github.com/rust-lang/hashbrown"
 readme = "README.md"
 keywords = ["hash", "no_std", "hashmap", "swisstable"]
 categories = ["data-structures", "no-std"]
-exclude = [".travis.yml", "bors.toml", "/ci/*"]
+exclude = [".github", "bors.toml", "/ci/*"]
 edition = "2018"
 
 [dependencies]

Cargo.toml

@@ -1,7 +1,7 @@
 hashbrown
 =========
 
-[![Build Status](https://travis-ci.com/rust-lang/hashbrown.svg?branch=master)](https://travis-ci.com/rust-lang/hashbrown)
+[![Build Status](https://github.com/rust-lang/hashbrown/actions/workflows/rust.yml/badge.svg)](https://github.com/rust-lang/hashbrown/actions)
 [![Crates.io](https://img.shields.io/crates/v/hashbrown.svg)](https://crates.io/crates/hashbrown)
 [![Documentation](https://docs.rs/hashbrown/badge.svg)](https://docs.rs/hashbrown)
 [![Rust](https://img.shields.io/badge/rust-1.49.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
@@ -114,8 +114,8 @@ this pre-generates seeds at compile time and embeds them as constants. See [aHas
 
 Licensed under either of:
 
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
 
 at your option.
 

README.md

@@ -38,7 +38,7 @@ impl Iterator for RandomKeys {
     type Item = usize;
     fn next(&mut self) -> Option<usize> {
         // Add 1 then multiply by some 32 bit prime.
-        self.state = self.state.wrapping_add(1).wrapping_mul(3787392781);
+        self.state = self.state.wrapping_add(1).wrapping_mul(3_787_392_781);
         Some(self.state)
     }
 }

benches/bench.rs

@@ -12,7 +12,7 @@ else
     FEATURES="rustc-internal-api,serde,rayon,raw,bumpalo"
     OP="test"
 fi
-if [ "${TRAVIS_RUST_VERSION}" = "nightly" ]; then
+if [ "${CHANNEL}" = "nightly" ]; then
     FEATURES="${FEATURES},nightly"
     export RUSTFLAGS="$RUSTFLAGS -D warnings"
 fi
@@ -36,7 +36,7 @@ fi
 "${CARGO}" -vv ${OP} --target="${TARGET}" --release
 "${CARGO}" -vv ${OP} --target="${TARGET}" --release --features "${FEATURES}"
 
-if [ "${TRAVIS_RUST_VERSION}" = "nightly" ] && [ "${NO_STD}" != 1 ]; then
+if [ "${CHANNEL}" = "nightly" ] && [ "${NO_STD}" != 1 ]; then
     # Run benchmark on native targets, build them on non-native ones:
     NO_RUN=""
     if [ "${CROSS}" = "1" ]; then

ci/run.sh

@@ -30,13 +30,9 @@ if retry rustup component add rustfmt ; then
 fi
 
 if retry rustup component add clippy ; then
-    cargo clippy --all -- -D clippy::pedantic
-fi
-
-if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-    if retry rustup component add clippy ; then
-        cargo clippy --all --target=i586-unknown-linux-gnu -- -D clippy::all -D clippy::pedantic
-    fi
+    cargo clippy --all --tests --features serde,rayon,bumpalo -- -D clippy::all -D clippy::pedantic
+    cargo clippy --all --tests --features raw -- -D clippy::all -D clippy::pedantic \
+        -A clippy::missing_safety_doc -A clippy::missing_errors_doc
 fi
 
 if command -v shellcheck ; then

ci/tools.sh

@@ -4,6 +4,7 @@ use alloc::vec::Vec;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 
 /// Helper for collecting parallel iterators to an intermediary
+#[allow(clippy::linkedlist)] // yes, we need linked list here for efficient appending!
 pub(super) fn collect<I: IntoParallelIterator>(iter: I) -> (LinkedList<Vec<I::Item>>, usize) {
     let list = iter
         .into_par_iter()

src/external_trait_impls/rayon/helpers.rs

@@ -512,7 +512,7 @@ mod test_par_map {
         where
             H: Hasher,
         {
-            self.k.hash(state)
+            self.k.hash(state);
         }
     }
 
@@ -679,7 +679,7 @@ mod test_par_map {
     fn test_values_mut() {
         let vec = vec![(1, 1), (2, 2), (3, 3)];
         let mut map: HashMap<_, _> = vec.into_par_iter().collect();
-        map.par_values_mut().for_each(|value| *value = (*value) * 2);
+        map.par_values_mut().for_each(|value| *value *= 2);
         let values: Vec<_> = map.par_values().cloned().collect();
         assert_eq!(values.len(), 3);
         assert!(values.contains(&2));