Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update MSRV and document MSRV policy #1848

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Update MSRV and document MSRV policy #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
strategy:
matrix:
rust-toolchain: [
# MSRV from Cargo.toml
"1.67",
# MSRV policy
"stable minus 2 releases",
"stable",
]
runs-on: ubuntu-latest
Expand Down Expand Up @@ -100,8 +100,8 @@ jobs:
strategy:
matrix:
rust-toolchain: [
# MSRV from Cargo.toml
"1.67",
# MSRV policy
"stable minus 2 releases",
"stable",
]
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ edition = "2021"
homepage = "https://divviup.org"
license = "MPL-2.0"
repository = "https://github.com/divviup/janus"
rust-version = "1.67.0"
rust-version = "1.70.0"
version = "0.5.14"

[workspace.dependencies]
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ tagged `janus_aggregator`, `janus_aggregation_job_creator`,
Pre-built container images are available at
[us-west2-docker.pkg.dev/divviup-artifacts-public/janus](https://us-west2-docker.pkg.dev/divviup-artifacts-public/janus).

## Minimum Supported Rust Version (MSRV)

We support the latest stable version of Rust, at time of release, and the two
preceding minor versions.

## Running tests

Tests require that [`docker`](https://www.docker.com) and
Expand Down
7 changes: 2 additions & 5 deletions aggregator/src/aggregator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,14 +2312,11 @@ impl VdafOps {
// went to CLOSED, in which case the collection job will start at COLLECTABLE).
let mut initial_collection_job_state = CollectionJobState::Collectable;

// Rust 1.65's clippy complains about needless collection, but we need to
// process through the iterator in order to update
// Note that we need to process through this iterator now in order to update
// `initial_collection_job_state` as a side-effect, since computing
// `initial_collection_job_state` is necessary to compute the collection job we
// are writing, and the collection job write occurs concurrently with the batch
// writes. This appears to be fixed in Rust 1.69 -- we can likely remove this
// annotation after the MSRV reaches that version.
#[allow(clippy::needless_collect)]
// writes.
let batches: Vec<_> = batches
.into_iter()
.flat_map(|(batch_identifier, batch)| {
Expand Down
Loading