Skip to content

Commit

Permalink
Merge pull request #6 from robsdedude/fix/ci
Browse files Browse the repository at this point in the history
Fix CI + wrong MSRV
  • Loading branch information
robsdedude authored Jan 19, 2024
2 parents c59bbe3 + 9d7ed12 commit a16c73c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: "ubuntu-latest"
strategy:
matrix:
rust-version: ["1.65", "stable"]
rust-version: ["1.70", "stable"]
steps:
- name: Pull Neo4j Docker Image
run: docker pull neo4j:5.6-enterprise
Expand All @@ -25,13 +25,17 @@ jobs:
-e NEO4J_dbms_security_auth__minimum__password__length=1
neo4j:5.6-enterprise &
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: ${{ matrix.rust-version }}
components: clippy
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: versions
run: cargo --version && cargo clippy --version
- name: versions nightly
run: cargo +nightly --version && cargo +nightly fmt --version
- name: cargo check
env:
RUSTFLAGS: -D warnings
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Disclaimer:


## MSRV
Currently, this crate's minimum supported Rust version is `1.65`.
Currently, this crate's minimum supported Rust version is `1.70`.
A bump in MSRV is considered a minor breaking change.


Expand Down
2 changes: 1 addition & 1 deletion neo4j/src/driver/io/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl Pool {
{
let resolved_db = &mut resolved_db;
drop(pools.routing_tables.update(move |mut rts| {
*resolved_db = pools.update_rts(args, &mut rts)?.clone();
*resolved_db = pools.update_rts(args, &mut rts)?;
Ok(())
})?);
}
Expand Down
6 changes: 1 addition & 5 deletions testkit_backend/src/testkit_backend/bookmarks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ pub(super) fn new_bookmark_manager(
None
};
let consumer = if with_consumer {
Some(make_consumer_fn(
manager_id,
backend_io.clone(),
id_generator.clone(),
))
Some(make_consumer_fn(manager_id, backend_io, id_generator))
} else {
None
};
Expand Down

0 comments on commit a16c73c

Please sign in to comment.