From ece411068b4fdd19145061ed9e8e2dd7dc68cd69 Mon Sep 17 00:00:00 2001 From: Ibraheem Ahmed Date: Sun, 5 May 2024 22:41:45 -0400 Subject: [PATCH] update workflows --- .github/workflows/check.yml | 2 +- .github/workflows/test.yml | 88 ------------------------------------- Cargo.toml | 6 +-- src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 93 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a366c8f..c9eb110 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -112,7 +112,7 @@ jobs: # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability strategy: matrix: - msrv: ["1.56.1"] # 2021 edition requires 1.56 + msrv: ["1.72.0"] name: ubuntu / ${{ matrix.msrv }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 38f6cb2..77e6c5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,10 +1,8 @@ # This is the main CI workflow that runs the test suite on all pushes to main and all pull requests. # It runs the following jobs: # - required: runs the test suite on ubuntu with stable and beta rust toolchains -# - minimal: runs the test suite with the minimal versions of the dependencies that satisfy the # requirements of this crate, and its dependencies # - os-check: runs the test suite on mac and windows -# - coverage: runs the test suite and collects coverage information # See check.yml for information about how the concurrency cancellation and workflow triggering works permissions: contents: read @@ -43,45 +41,6 @@ jobs: # https://github.com/rust-lang/cargo/issues/6669 - name: cargo test --doc run: cargo test --locked --all-features --doc - minimal: - # This action chooses the oldest version of the dependencies permitted by Cargo.toml to ensure - # that this crate is compatible with the minimal version that this crate and its dependencies - # require. This will pickup issues where this create relies on functionality that was introduced - # later than the actual version specified (e.g., when we choose just a major version, but a - # method was added after this version). - # - # This particular check can be difficult to get to succeed as often transitive dependencies may - # be incorrectly specified (e.g., a dependency specifies 1.0 but really requires 1.1.5). There - # is an alternative flag available -Zdirect-minimal-versions that uses the minimal versions for - # direct dependencies of this crate, while selecting the maximal versions for the transitive - # dependencies. Alternatively, you can add a line in your Cargo.toml to artificially increase - # the minimal dependency, which you do with e.g.: - # ```toml - # # for minimal-versions - # [target.'cfg(any())'.dependencies] - # openssl = { version = "0.10.55", optional = true } # needed to allow foo to build with -Zminimal-versions - # ``` - # The optional = true is necessary in case that dependency isn't otherwise transitively required - # by your library, and the target bit is so that this dependency edge never actually affects - # Cargo build order. See also - # https://github.com/jonhoo/fantoccini/blob/fde336472b712bc7ebf5b4e772023a7ba71b2262/Cargo.toml#L47-L49. - # This action is run on ubuntu with the stable toolchain, as it is not expected to fail - runs-on: ubuntu-latest - name: ubuntu / stable / minimal-versions - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - - name: Install nightly for -Zminimal-versions - uses: dtolnay/rust-toolchain@nightly - - name: rustup default stable - run: rustup default stable - - name: cargo update -Zminimal-versions - run: cargo +nightly update -Zminimal-versions - - name: cargo test - run: cargo test --locked --all-features --all-targets os-check: # run cargo test on mac and windows runs-on: ${{ matrix.os }} @@ -107,50 +66,3 @@ jobs: run: cargo generate-lockfile - name: cargo test run: cargo test --locked --all-features --all-targets - coverage: - # use llvm-cov to build and collect coverage and outputs in a format that - # is compatible with codecov.io - # - # note that codecov as of v4 requires that CODECOV_TOKEN from - # - # https://app.codecov.io/gh///settings - # - # is set in two places on your repo: - # - # - https://github.com/jonhoo/guardian/settings/secrets/actions - # - https://github.com/jonhoo/guardian/settings/secrets/dependabot - # - # (the former is needed for codecov uploads to work with Dependabot PRs) - # - # PRs coming from forks of your repo will not have access to the token, but - # for those, codecov allows uploading coverage reports without a token. - # it's all a little weird and inconvenient. see - # - # https://github.com/codecov/feedback/issues/112 - # - # for lots of more discussion - runs-on: ubuntu-latest - name: ubuntu / stable / coverage - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable - uses: dtolnay/rust-toolchain@stable - with: - components: llvm-tools-preview - - name: cargo install cargo-llvm-cov - uses: taiki-e/install-action@cargo-llvm-cov - - name: cargo generate-lockfile - if: hashFiles('Cargo.lock') == '' - run: cargo generate-lockfile - - name: cargo llvm-cov - run: cargo llvm-cov --locked --all-features --lcov --output-path lcov.info - - name: Record Rust version - run: echo "RUST=$(rustc --version)" >> "$GITHUB_ENV" - - name: Upload to codecov.io - uses: codecov/codecov-action@v4 - with: - fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} - env_vars: OS,RUST diff --git a/Cargo.toml b/Cargo.toml index 66c6c6b..1876d8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,9 @@ atomic-wait = "1.1.0" seize = "0.4.0" [dev-dependencies] -rand = "0.8" -dashmap = "5.5" -criterion = "0.5" +rand = "0.8.5" +dashmap = "5.5.3" +criterion = "0.5.1" [[bench]] name = "compare" diff --git a/src/lib.rs b/src/lib.rs index 0e14c9e..d53a134 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,5 +3,5 @@ mod map; mod raw; -pub use map::{HashMap, HashMapRef, Iter, Keys, Values, ResizeMode}; +pub use map::{HashMap, HashMapRef, Iter, Keys, ResizeMode, Values}; pub use seize::{Guard, OwnedGuard};