From 32c843493ee2b7655ccabefb32dc92bccf231adb Mon Sep 17 00:00:00 2001 From: tyranron Date: Fri, 22 Mar 2024 17:45:05 +0200 Subject: [PATCH] Upgrade `juniper` crate from 0.15 to 0.16 version - bump up MSRV to 1.73 Additionally: - upgrade `heck` crate from 0.4 to 0.5 version --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 18 ++++++++++++++++++ Cargo.toml | 6 +++--- README.md | 2 +- src/lib.rs | 6 +++--- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eee63e8..1d29e9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - msrv: ["1.65.0"] + msrv: ["1.73.0"] os: - ubuntu - macOS diff --git a/CHANGELOG.md b/CHANGELOG.md index eae363e..81b064a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,24 @@ All user visible changes to `gherkin` crate will be documented in this file. Thi +## [0.15.0] · 2024-??-?? (unreleased) +[0.15.0]: /../../tree/v0.15.0 + +[Diff](/../../compare/v0.14.0...v0.15.0) + +### BC Breaks + +- Bump up [MSRV] to 1.73 to support newer versions of dependencies. ([todo]) + +### Upgraded + +- [`juniper`] crate to 0.16 version. ([todo]) + +[todo]: /../../commit/todo + + + + ## [0.14.0] · 2023-07-14 [0.14.0]: /../../tree/v0.14.0 diff --git a/Cargo.toml b/Cargo.toml index b39c93d..e2f476b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "gherkin" version = "0.14.0" edition = "2018" -rust-version = "1.65" +rust-version = "1.73" description = """\ Pure Rust implementation of Gherkin language (`.feature` file) for \ Cucumber testing framework.\ @@ -38,10 +38,10 @@ typed-builder = { version = "0.18", optional = true } serde = { version = "1.0.103", features = ["derive"], optional = true } # "juniper" feature enables ability to use AST as GraphQL types. -juniper = { version = "0.15.12", default-features = false, optional = true } +juniper = { version = "0.16", default-features = false, optional = true } [build-dependencies] -heck = "0.4" +heck = "0.5" quote = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/README.md b/README.md index 5335872..966e48c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Gherkin language for Rust ========================= [![crates.io](https://img.shields.io/crates/v/gherkin.svg "crates.io")](https://crates.io/crates/gherkin) -[![Rust 1.65+](https://img.shields.io/badge/rustc-1.65+-lightgray.svg "Rust 1.65+")](https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html) +[![Rust 1.73+](https://img.shields.io/badge/rustc-1.73+-lightgray.svg "Rust 1.73+")](https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html) [![Unsafe Forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg "Unsafe forbidden")](https://github.com/rust-secure-code/safety-dance) [![CI](https://github.com/cucumber-rs/gherkin/workflows/CI/badge.svg?branch=main "CI")](https://github.com/cucumber-rs/gherkin/actions?query=workflow%3ACI+branch%3Amain) [![Rust docs](https://docs.rs/gherkin/badge.svg "Rust docs")](https://docs.rs/gherkin) diff --git a/src/lib.rs b/src/lib.rs index ef498d1..8d6ddde 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -76,7 +76,7 @@ pub struct Span { } #[cfg(feature = "juniper")] -#[cfg_attr(feature = "juniper", juniper::graphql_object)] +#[juniper::graphql_object] impl Span { pub fn start(&self) -> i32 { self.start as i32 @@ -95,7 +95,7 @@ pub struct LineCol { } #[cfg(feature = "juniper")] -#[cfg_attr(feature = "juniper", juniper::graphql_object)] +#[juniper::graphql_object] impl LineCol { pub fn line(&self) -> i32 { self.line as i32 @@ -188,7 +188,7 @@ pub struct Feature { pub position: LineCol, /// The path supplied for the parsed `Feature`, if known. #[cfg_attr(feature = "parser", builder(default))] - #[cfg_attr(feature = "juniper", graphql(skip))] + #[cfg_attr(feature = "juniper", graphql(ignore))] pub path: Option, }