Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
env:
RUST_LOG: debug
CARGO_TERM_COLOR: always
MSRV: 1.75.0
MSRV: 1.81.0
HACK: hack --package bolt4rs --each-feature --exclude-features unstable-serde-packstream-format,unstable-bolt-protocol-impl-v2,unstable-result-summary

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

env:
RUSTUP_TOOLCHAIN: stable
MSRV: 1.75.0
MSRV: 1.81.0

jobs:
make-release-pr:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Cleaning up...

## MSRV

The crate has a minimum supported Rust version (MSRV) of `1.75.0` as of 0.9.x.
The crate has a minimum supported Rust version (MSRV) of `1.81.0` as of 0.9.x.
The version [0.8.x](https://crates.io/crates/bolt4rs/0.8.0) has an MSRV of `1.63.0`

A change in the MSRV in *not* considered a breaking change.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/bolt4rs"
readme = "../README.md"
keywords = ["bolt", "driver", "bolt", "cypher", "tokio"]
categories = ["database", "network-programming", "asynchronous"]
rust-version = "1.75.0"
rust-version = "1.81"

[features]
default = ["unstable-bolt-protocol-impl-v2"]
Expand Down
2 changes: 1 addition & 1 deletion lib/src/bolt/structs/point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ impl<'de> Deserialize<'de> for Point {
type Value = Point;

fn expecting(&self, formatter: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
formatter.write_str(concat!("a valid Point2D or Point3D struct"))
formatter.write_str("a valid Point2D or Point3D struct")
}

fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
Expand Down
2 changes: 1 addition & 1 deletion lib/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ impl ConnectionInfo {
}

#[cfg(feature = "unstable-bolt-protocol-impl-v2")]
pub(crate) fn to_hello(&self, version: Version) -> Hello {
pub(crate) fn to_hello(&self, version: Version) -> Hello<'_> {
match self.routing {
Routing::No => HelloBuilder::new(&self.user, &self.password).build(version),
Routing::Yes(ref routing) => HelloBuilder::new(&self.user, &self.password)
Expand Down
1 change: 1 addition & 0 deletions lib/src/messages/bye.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use bolt4rs_macros::BoltStruct;
feature = "unstable-bolt-protocol-impl-v2",
deprecated(since = "0.9.0", note = "Use `crate::bolt::Bye` instead.")
)]
#[allow(unused)]
pub struct Bye;

#[cfg(test)]
Expand Down
9 changes: 2 additions & 7 deletions lib/src/types/serde/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,13 @@ impl ElementBuilder {
}
}

#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, Default)]
pub enum SetOnce<T> {
#[default]
Empty,
Set(T),
}

impl<T> Default for SetOnce<T> {
fn default() -> Self {
Self::Empty
}
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct SetOnceError;

Expand Down
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
description = "Macros used by bolt4rs"
license = "MIT"
repository = "https://github.com/neo4j-labs/bolt4rs"
rust-version = "1.63"
rust-version = "1.81"

[lib]
proc-macro = true
Expand Down
5 changes: 3 additions & 2 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "bolt4rs-server"
version = "0.1.0"
rust-version = "1.81"
edition = "2021"

[features]
Expand All @@ -19,8 +20,8 @@ log = "0.4"
env_logger = "0.10"
bolt4rs = { path = "../lib", features = ["unstable-bolt-protocol-impl-v2", "unstable-serde-packstream-format"] }
anyhow = "1.0"
clap = { version = "4.4", features = ["derive"] }
lbug = { version = "^0.12.0", features = ["arrow"] }
clap = { version = ">=4.4, <=4.5.56", features = ["derive"] }
lbug = { version = "^0.15.2", features = ["arrow"] }
arrow-array = { version = "55.0.0", default-features = false }
arrow = { version = "55.0.0", default-features = false }
arrow-schema = { version = "55.0.0", default-features = false }
Expand Down
25 changes: 11 additions & 14 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fn update_msrv_lock() -> Result {

let msrv = {
let metadata = cmd!(sh, "{cargo} metadata --no-deps --format-version=1").read()?;
let package = "neo4rs";
let package = "bolt4rs";

cmd!(
sh,
Expand All @@ -65,17 +65,16 @@ fn update_msrv_lock() -> Result {
cmd!(sh, "rm {lockfile}").run_if(dry_run)?;

let pin_versions: &[(String, &str)] = &[
("home".to_owned(), "0.5.9"),
("litemap".to_owned(), "0.7.4"),
("testcontainers".to_owned(), "0.23.1"),
("testcontainers-modules".to_owned(), "0.11.4"),
("zerofrom".to_owned(), "0.1.5"),
("backon".to_owned(), "1.5.2"),
("idna_adapter".to_owned(), "1.2.0"),
("litemap".to_owned(), "0.7.5"),
("home".to_owned(), "0.5.11"),
];
for (krate, version) in pin_versions {
pin_version(dry_run, &sh, &cargo, krate, version)?;
}

cmd!(sh, "cargo +{msrv} test --no-run --all-features").run_if(dry_run)?;
cmd!(sh, "{cargo} +{msrv} test --no-run --all-features").run_if(dry_run)?;

cmd!(sh, "cp {lockfile} {ci_dir}/Cargo.lock.msrv").run_if(dry_run)?;

Expand All @@ -96,20 +95,18 @@ fn update_min_lock() -> Result {
cmd!(sh, "rm {lockfile}").run_if(dry_run)?;

let pin_versions: &[(String, &str)] = &[
("home".to_owned(), "0.5.9"),
("litemap".to_owned(), "0.7.4"),
("serde_repr".to_owned(), "0.1.5"),
("testcontainers".to_owned(), "0.23.1"),
("testcontainers-modules".to_owned(), "0.11.4"),
("zerofrom".to_owned(), "0.1.5"),
("backon".to_owned(), "1.5.2"),
("idna_adapter".to_owned(), "1.2.0"),
("litemap".to_owned(), "0.7.5"),
("home".to_owned(), "0.5.11"),
];
for (krate, version) in pin_versions {
pin_version(dry_run, &sh, &cargo, krate, version)?;
}

cmd!(
sh,
"cargo +nightly -Z minimal-versions test --no-run --all-features"
"{cargo} +nightly -Z minimal-versions test --no-run --all-features"
)
.env("RUST_LOG", "debug")
.run_if(dry_run)?;
Expand Down
Loading