From 37b7d245f6f86b6bca49920b6cb6c780db05e4b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:06:05 +0000 Subject: [PATCH 1/5] build(deps): Bump the gha-deps group with 2 updates Bumps the gha-deps group with 2 updates: [ruby/setup-ruby](https://github.com/ruby/setup-ruby) and [EmbarkStudios/cargo-deny-action](https://github.com/embarkstudios/cargo-deny-action). Updates `ruby/setup-ruby` from 1.199.0 to 1.202.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](https://github.com/ruby/setup-ruby/compare/7d3497fd78c07c0d84ebafa58d8dac60cd1f0763...a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc) Updates `EmbarkStudios/cargo-deny-action` from 2.0.1 to 2.0.3 - [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases) - [Commits](https://github.com/embarkstudios/cargo-deny-action/compare/8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268...2d8c9929d8f9f42bedba73f1287cb0b479f07acb) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gha-deps - dependency-name: EmbarkStudios/cargo-deny-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gha-deps ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yaml | 4 ++-- .github/workflows/ci.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index adb399c1a6d..7161880a8b7 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4.2.2 - name: Install Ruby toolchain - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0 + uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0 with: ruby-version: ".ruby-version" bundler-cache: true @@ -52,7 +52,7 @@ jobs: cargo generate-lockfile --verbose fi - - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2.0.1 + - uses: EmbarkStudios/cargo-deny-action@2d8c9929d8f9f42bedba73f1287cb0b479f07acb # v2.0.3 with: arguments: --locked --all-features command: check ${{ matrix.checks }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c456dc4a896..651397ad2fd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -117,7 +117,7 @@ jobs: uses: actions/checkout@v4.2.2 - name: Install Ruby toolchain - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0 + uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0 with: ruby-version: ".ruby-version" bundler-cache: true From 8b023ee52b0d847b261848ece5086b5d71d3ae4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:09:29 +0000 Subject: [PATCH 2/5] build(deps-dev): Bump prettier from 3.2.5 to 3.4.1 in the npm-deps group Bumps the npm-deps group with 1 update: [prettier](https://github.com/prettier/prettier). Updates `prettier` from 3.2.5 to 3.4.1 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.2.5...3.4.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-deps ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca9af4d1eab..ae407c66d14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "devDependencies": { "@artichokeruby/clang-format": "github:artichoke/clang-format#semver:^0.17.0", - "prettier": "^3.2.5" + "prettier": "^3.4.1" } }, "node_modules/@artichokeruby/clang-format": { @@ -73,9 +73,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz", + "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/package.json b/package.json index 2ca946033cd..ae88434caa1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "bugs": "https://github.com/artichoke/strudel/issues", "devDependencies": { "@artichokeruby/clang-format": "github:artichoke/clang-format#semver:^0.17.0", - "prettier": "^3.2.5" + "prettier": "^3.4.1" }, "scripts": { "fmt": "prettier --write \"**/*\"", From 4d2ecf90025192859caff3b803ac2df11ab5d854 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:33:02 +0000 Subject: [PATCH 3/5] build(deps): Bump rubocop in the bundler-deps group Bumps the bundler-deps group with 1 update: [rubocop](https://github.com/rubocop/rubocop). Updates `rubocop` from 1.68.0 to 1.69.0 - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.68.0...v1.69.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production update-type: version-update:semver-minor dependency-group: bundler-deps ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index ff3b9b4929e..ec7ae14d834 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,5 @@ source 'https://rubygems.org' gem 'bundler-audit', '~> 0.9', require: false gem 'rake', '>= 12.3.3', require: false -gem 'rubocop', '~> 1.68', require: false +gem 'rubocop', '~> 1.69', require: false gem 'rubocop-rake', '~> 0.6', require: false diff --git a/Gemfile.lock b/Gemfile.lock index d284a682344..0edf838c115 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,33 +5,35 @@ GEM bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) - json (2.7.5) + json (2.8.2) language_server-protocol (3.17.0.3) parallel (1.26.3) - parser (3.3.5.1) + parser (3.3.6.0) ast (~> 2.4.1) racc racc (1.8.1) rainbow (3.1.1) rake (13.2.1) - regexp_parser (2.9.2) - rubocop (1.68.0) + regexp_parser (2.9.3) + rubocop (1.69.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + rubocop-ast (>= 1.36.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.33.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.36.2) parser (>= 3.3.1.0) rubocop-rake (0.6.0) rubocop (~> 1.0) ruby-progressbar (1.13.0) thor (1.3.2) - unicode-display_width (2.6.0) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS ruby @@ -39,7 +41,7 @@ PLATFORMS DEPENDENCIES bundler-audit (~> 0.9) rake (>= 12.3.3) - rubocop (~> 1.68) + rubocop (~> 1.69) rubocop-rake (~> 0.6) BUNDLED WITH From 6ff73691b82b14ed8ebf352609b566234537e62e Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Tue, 17 Dec 2024 05:46:47 +0900 Subject: [PATCH 4/5] Update bundler and Ruby --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 619b5376684..9c25013dbb8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.3.6 diff --git a/Gemfile.lock b/Gemfile.lock index 0edf838c115..0aaebbb7927 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,4 +45,4 @@ DEPENDENCIES rubocop-rake (~> 0.6) BUNDLED WITH - 2.5.15 + 2.6.0 From a9b95f7db435813b2d7c2a75bb583edba82f8c21 Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Tue, 17 Dec 2024 05:49:49 +0900 Subject: [PATCH 5/5] Address `clippy::needless_lifetimes` lint violations --- src/st/map/iter.rs | 12 ++++++------ src/st/set/iter.rs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/st/map/iter.rs b/src/st/map/iter.rs index bda7ef78d6f..de825cb545a 100644 --- a/src/st/map/iter.rs +++ b/src/st/map/iter.rs @@ -30,9 +30,9 @@ impl<'a, K, V> Iterator for Iter<'a, K, V> { } } -impl<'a, K, V> FusedIterator for Iter<'a, K, V> {} +impl FusedIterator for Iter<'_, K, V> {} -impl<'a, K, V> DoubleEndedIterator for Iter<'a, K, V> { +impl DoubleEndedIterator for Iter<'_, K, V> { fn next_back(&mut self) -> Option { loop { match self.0.next_back() { @@ -123,9 +123,9 @@ impl<'a, K, V> Iterator for Keys<'a, K, V> { } } -impl<'a, K, V> FusedIterator for Keys<'a, K, V> {} +impl FusedIterator for Keys<'_, K, V> {} -impl<'a, K, V> DoubleEndedIterator for Keys<'a, K, V> { +impl DoubleEndedIterator for Keys<'_, K, V> { fn next_back(&mut self) -> Option { self.0.next_back().map(|(key, _)| key) } @@ -174,9 +174,9 @@ impl<'a, K, V> Iterator for Values<'a, K, V> { } } -impl<'a, K, V> FusedIterator for Values<'a, K, V> {} +impl FusedIterator for Values<'_, K, V> {} -impl<'a, K, V> DoubleEndedIterator for Values<'a, K, V> { +impl DoubleEndedIterator for Values<'_, K, V> { fn next_back(&mut self) -> Option { self.0.next_back().map(|(_, value)| value) } diff --git a/src/st/set/iter.rs b/src/st/set/iter.rs index 4f15888a197..5385a32dc73 100644 --- a/src/st/set/iter.rs +++ b/src/st/set/iter.rs @@ -42,11 +42,11 @@ impl<'a, T> Iterator for Iter<'a, T> { } } -impl<'a, T> FusedIterator for Iter<'a, T> {} +impl FusedIterator for Iter<'_, T> {} -impl<'a, T> ExactSizeIterator for Iter<'a, T> {} +impl ExactSizeIterator for Iter<'_, T> {} -impl<'a, T> DoubleEndedIterator for Iter<'a, T> { +impl DoubleEndedIterator for Iter<'_, T> { fn next_back(&mut self) -> Option { self.0.next_back() }