Skip to content

Commit

Permalink
Merge pull request #157 from artichoke/lopopolo/ci-breakage
Browse files Browse the repository at this point in the history
Update ruby and bundler, fix new lint violations, bump MSRV to 1.76.0
  • Loading branch information
lopopolo authored Dec 8, 2024
2 parents 5546d5e + 5d9b1c1 commit 85c1379
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/[email protected]

- 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
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
with:
toolchain: "1.58.0"
toolchain: "1.76.0"

- name: Compile
run: cargo build --verbose
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
uses: actions/[email protected]

- 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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.3
3.3.6
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "strftime-ruby"
# remember to set `html_root_url` in `src/lib.rs`.
version = "1.0.1"
version = "1.1.0"
authors = ["Ryan Lopopolo <[email protected]>", "x-hgg-x"]
license = "MIT"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.76.0"
readme = "README.md"
repository = "https://github.com/artichoke/strftime-ruby"
documentation = "https://docs.rs/strftime-ruby"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 12 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,8 +42,8 @@ PLATFORMS
DEPENDENCIES
bundler-audit (~> 0.9)
rake (>= 12.3.3)
rubocop (~> 1.68)
rubocop (~> 1.69)
rubocop-rake (~> 0.6)

BUNDLED WITH
2.5.15
2.5.23
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Add this to your `Cargo.toml`:
```toml
[dependencies]
strftime-ruby = "1.0.1"
strftime-ruby = "1.1.0"
```
## Crate features
Expand All @@ -64,7 +64,7 @@ All features are enabled by default.

### Minimum Supported Rust Version

This crate requires at least Rust 1.58.0. This version can be bumped in minor
This crate requires at least Rust 1.76.0. This version can be bumped in minor
releases.

## License
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://www.artichokeruby.org",
"bugs": "https://github.com/artichoke/ruby-strftime/issues",
"devDependencies": {
"prettier": "^3.2.5"
"prettier": "^3.4.1"
},
"scripts": {
"fmt": "prettier --write \"**/*\""
Expand Down
2 changes: 1 addition & 1 deletion src/format/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl<'a> SizeLimiter<'a> {
}
}

impl<'a> Write for SizeLimiter<'a> {
impl Write for SizeLimiter<'_> {
fn write(&mut self, buf: &[u8]) -> Result<usize, Error> {
if self.count + buf.len() > self.size_limit {
return Err(Error::FormattedStringTooLarge);
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
//! days in that year. The days before the first week are in the last week of
//! the previous year.
#![doc(html_root_url = "https://docs.rs/strftime-ruby/1.0.1")]
#![doc(html_root_url = "https://docs.rs/strftime-ruby/1.1.0")]
#![no_std]

#[cfg(feature = "alloc")]
Expand Down

0 comments on commit 85c1379

Please sign in to comment.