Skip to content

Commit

Permalink
Merge #944 #945
Browse files Browse the repository at this point in the history
944: Run cargo-careful in CI r=taiki-e a=taiki-e

https://github.com/RalfJung/cargo-careful

This allows to catch UB like #940.

945: Prepare for the next release r=taiki-e a=taiki-e

- crossbeam-skiplist 0.1.1
  - Fix `get_unchecked` panic by raw pointer calculation. (#940)

Also, I'll yank crossbeam-skiplist 0.1.0 once 0.1.1 is released.

Co-authored-by: Taiki Endo <[email protected]>
  • Loading branch information
bors[bot] and taiki-e authored Dec 27, 2022
3 parents 8903ff0 + b6b8c78 + 764fe89 commit 960c08a
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ status = [
"test (aarch64-apple-darwin)",
"test (x86_64-apple-darwin)",
]
timeout_sec = 7200
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,18 @@ jobs:
- name: miri
run: ./ci/miri.sh

# Run cargo-careful.
careful:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
run: rustup toolchain install nightly --component rust-src && rustup default nightly
- name: Install cargo-careful
run: cargo install cargo-careful --locked --debug
- name: Run cargo-careful
run: ./ci/careful.sh

# Run sanitizers.
san:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -222,6 +234,7 @@ jobs:
- rustfmt
- clippy
- miri
- careful
- san
- loom
- docs
Expand Down
8 changes: 8 additions & 0 deletions ci/careful.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euxo pipefail
IFS=$'\n\t'
cd "$(dirname "$0")"/..

export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"

cargo careful test --all --all-features --exclude benchmarks -- --test-threads=1
6 changes: 6 additions & 0 deletions crossbeam-skiplist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Version 0.1.1

- Fix `get_unchecked` panic by raw pointer calculation. (#940)

# Version 0.1.0

**Note:** This release has been yanked due to bug fixed in 0.1.1.

- Initial implementation.
2 changes: 1 addition & 1 deletion crossbeam-skiplist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-skiplist"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-skiplist-X.Y.Z" git tag
version = "0.1.0"
version = "0.1.1"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down

0 comments on commit 960c08a

Please sign in to comment.