Skip to content

Commit 85c1379

Browse files
authored
Merge pull request #157 from artichoke/lopopolo/ci-breakage
Update ruby and bundler, fix new lint violations, bump MSRV to 1.76.0
2 parents 5546d5e + 5d9b1c1 commit 85c1379

File tree

11 files changed

+30
-27
lines changed

11 files changed

+30
-27
lines changed

.github/workflows/audit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4.2.2
2020

2121
- name: Install Ruby toolchain
22-
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
22+
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
2323
with:
2424
ruby-version: ".ruby-version"
2525
bundler-cache: true
@@ -52,7 +52,7 @@ jobs:
5252
cargo generate-lockfile --verbose
5353
fi
5454
55-
- uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2.0.1
55+
- uses: EmbarkStudios/cargo-deny-action@2d8c9929d8f9f42bedba73f1287cb0b479f07acb # v2.0.3
5656
with:
5757
arguments: --locked --all-features
5858
command: check ${{ matrix.checks }}

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: Install Rust toolchain
7474
uses: artichoke/setup-rust/build-and-test@v1.12.1
7575
with:
76-
toolchain: "1.58.0"
76+
toolchain: "1.76.0"
7777

7878
- name: Compile
7979
run: cargo build --verbose
@@ -120,7 +120,7 @@ jobs:
120120
uses: actions/checkout@v4.2.2
121121

122122
- name: Install Ruby toolchain
123-
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
123+
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
124124
with:
125125
ruby-version: ".ruby-version"
126126
bundler-cache: true

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.3
1+
3.3.6

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "strftime-ruby"
33
# remember to set `html_root_url` in `src/lib.rs`.
4-
version = "1.0.1"
4+
version = "1.1.0"
55
authors = ["Ryan Lopopolo <rjl@hyperbo.la>", "x-hgg-x"]
66
license = "MIT"
77
edition = "2021"
8-
rust-version = "1.58.0"
8+
rust-version = "1.76.0"
99
readme = "README.md"
1010
repository = "https://github.com/artichoke/strftime-ruby"
1111
documentation = "https://docs.rs/strftime-ruby"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ source 'https://rubygems.org'
44

55
gem 'bundler-audit', '~> 0.9', require: false
66
gem 'rake', '>= 12.3.3', require: false
7-
gem 'rubocop', '~> 1.68', require: false
7+
gem 'rubocop', '~> 1.69', require: false
88
gem 'rubocop-rake', '~> 0.6', require: false

Gemfile.lock

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@ GEM
55
bundler-audit (0.9.2)
66
bundler (>= 1.2.0, < 3)
77
thor (~> 1.0)
8-
json (2.7.5)
8+
json (2.8.2)
99
language_server-protocol (3.17.0.3)
1010
parallel (1.26.3)
11-
parser (3.3.5.1)
11+
parser (3.3.6.0)
1212
ast (~> 2.4.1)
1313
racc
1414
racc (1.8.1)
1515
rainbow (3.1.1)
1616
rake (13.2.1)
17-
regexp_parser (2.9.2)
18-
rubocop (1.68.0)
17+
regexp_parser (2.9.3)
18+
rubocop (1.69.0)
1919
json (~> 2.3)
2020
language_server-protocol (>= 3.17.0)
2121
parallel (~> 1.10)
2222
parser (>= 3.3.0.2)
2323
rainbow (>= 2.2.2, < 4.0)
2424
regexp_parser (>= 2.4, < 3.0)
25-
rubocop-ast (>= 1.32.2, < 2.0)
25+
rubocop-ast (>= 1.36.1, < 2.0)
2626
ruby-progressbar (~> 1.7)
27-
unicode-display_width (>= 2.4.0, < 3.0)
28-
rubocop-ast (1.33.0)
27+
unicode-display_width (>= 2.4.0, < 4.0)
28+
rubocop-ast (1.36.2)
2929
parser (>= 3.3.1.0)
3030
rubocop-rake (0.6.0)
3131
rubocop (~> 1.0)
3232
ruby-progressbar (1.13.0)
3333
thor (1.3.2)
34-
unicode-display_width (2.6.0)
34+
unicode-display_width (3.1.2)
35+
unicode-emoji (~> 4.0, >= 4.0.4)
36+
unicode-emoji (4.0.4)
3537

3638
PLATFORMS
3739
ruby
@@ -40,8 +42,8 @@ PLATFORMS
4042
DEPENDENCIES
4143
bundler-audit (~> 0.9)
4244
rake (>= 12.3.3)
43-
rubocop (~> 1.68)
45+
rubocop (~> 1.69)
4446
rubocop-rake (~> 0.6)
4547

4648
BUNDLED WITH
47-
2.5.15
49+
2.5.23

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Add this to your `Cargo.toml`:
3737
3838
```toml
3939
[dependencies]
40-
strftime-ruby = "1.0.1"
40+
strftime-ruby = "1.1.0"
4141
```
4242
4343
## Crate features
@@ -64,7 +64,7 @@ All features are enabled by default.
6464

6565
### Minimum Supported Rust Version
6666

67-
This crate requires at least Rust 1.58.0. This version can be bumped in minor
67+
This crate requires at least Rust 1.76.0. This version can be bumped in minor
6868
releases.
6969

7070
## License

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"homepage": "https://www.artichokeruby.org",
1515
"bugs": "https://github.com/artichoke/ruby-strftime/issues",
1616
"devDependencies": {
17-
"prettier": "^3.2.5"
17+
"prettier": "^3.4.1"
1818
},
1919
"scripts": {
2020
"fmt": "prettier --write \"**/*\""

src/format/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl<'a> SizeLimiter<'a> {
8383
}
8484
}
8585

86-
impl<'a> Write for SizeLimiter<'a> {
86+
impl Write for SizeLimiter<'_> {
8787
fn write(&mut self, buf: &[u8]) -> Result<usize, Error> {
8888
if self.count + buf.len() > self.size_limit {
8989
return Err(Error::FormattedStringTooLarge);

0 commit comments

Comments
 (0)