Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ruby and bundler, bump MSRV to 1.76.0 #289

Merged
merged 5 commits into from
Dec 8, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand All @@ -41,7 +41,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -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
20 changes: 10 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down Expand Up @@ -104,12 +104,12 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- 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 @@ -142,7 +142,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -163,7 +163,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -186,10 +186,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand All @@ -202,10 +202,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Setup Node.js runtime
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: "lts/*"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install nightly Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown-link-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Check for broken links in markdown files
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # v1.0.15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/miri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/repo-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
name: Synchronize repository labels
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: Sync GitHub Issue Labels
uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # v5.0.0
uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # v5.1.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
yaml-file: .github/labels.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rustdoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
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
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[package]
name = "intaglio"
version = "1.9.1" # remember to set `html_root_url` in `src/lib.rs`.
version = "1.10.0" # remember to set `html_root_url` in `src/lib.rs`.
authors = ["Ryan Lopopolo <[email protected]>"]
license = "MIT"
edition = "2021"
rust-version = "1.58.0"
rust-version = "1.76.0"
readme = "README.md"
repository = "https://github.com/artichoke/intaglio"
documentation = "https://docs.rs/intaglio"
homepage = "https://github.com/artichoke/intaglio"
description = "UTF-8 string and byte string interner and symbol table"
keywords = ["bytestring", "intern", "interner", "symbol", "utf8"]
categories = ["caching", "data-structures"]
include = ["src/**/*", "tests/**/*", "LICENSE", "README.md"]
include = ["/src/**/*", "/tests/**/*", "/LICENSE", "/README.md"]

[features]
# All features are enabled by default.
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.66', 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,42 +5,44 @@ GEM
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
json (2.7.2)
json (2.8.2)
language_server-protocol (3.17.0.3)
parallel (1.26.3)
parser (3.3.5.0)
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.66.1)
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.32.3)
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

DEPENDENCIES
bundler-audit (~> 0.9)
rake (>= 12.3.3)
rubocop (~> 1.66)
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 @@ -36,7 +36,7 @@ Add this to your `Cargo.toml`:

```toml
[dependencies]
intaglio = "1.9.1"
intaglio = "1.10.0"
```

Then intern UTF-8 strings like:
Expand Down Expand Up @@ -136,7 +136,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
8 changes: 4 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/intaglio/issues",
"devDependencies": {
"prettier": "^3.2.5"
"prettier": "^3.4.1"
},
"scripts": {
"fmt": "prettier --write \"**/*\""
Expand Down
14 changes: 7 additions & 7 deletions src/bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub struct AllSymbols<'a> {
phantom: PhantomData<&'a SymbolTable>,
}

impl<'a> Iterator for AllSymbols<'a> {
impl Iterator for AllSymbols<'_> {
type Item = Symbol;

fn next(&mut self) -> Option<Self::Item> {
Expand Down Expand Up @@ -123,7 +123,7 @@ impl<'a> Iterator for AllSymbols<'a> {
}
}

impl<'a> DoubleEndedIterator for AllSymbols<'a> {
impl DoubleEndedIterator for AllSymbols<'_> {
fn next_back(&mut self) -> Option<Self::Item> {
let next = self.range.next_back()?;
debug_assert!(u32::try_from(next).is_ok());
Expand All @@ -137,7 +137,7 @@ impl<'a> DoubleEndedIterator for AllSymbols<'a> {
}
}

impl<'a> FusedIterator for AllSymbols<'a> {}
impl FusedIterator for AllSymbols<'_> {}

/// An iterator over all interned byte strings in a [`SymbolTable`].
///
Expand Down Expand Up @@ -188,7 +188,7 @@ impl<'a> Iterator for Bytestrings<'a> {
}
}

impl<'a> DoubleEndedIterator for Bytestrings<'a> {
impl DoubleEndedIterator for Bytestrings<'_> {
fn next_back(&mut self) -> Option<Self::Item> {
self.0.next_back().map(Interned::as_slice)
}
Expand All @@ -205,13 +205,13 @@ impl<'a> DoubleEndedIterator for Bytestrings<'a> {
}
}

impl<'a> ExactSizeIterator for Bytestrings<'a> {
impl ExactSizeIterator for Bytestrings<'_> {
fn len(&self) -> usize {
self.0.len()
}
}

impl<'a> FusedIterator for Bytestrings<'a> {}
impl FusedIterator for Bytestrings<'_> {}

/// An iterator over all symbols and interned byte strings in a [`SymbolTable`].
///
Expand Down Expand Up @@ -266,7 +266,7 @@ impl<'a> Iterator for Iter<'a> {
}
}

impl<'a> FusedIterator for Iter<'a> {}
impl FusedIterator for Iter<'_> {}

impl<'a, S> IntoIterator for &'a SymbolTable<S> {
type Item = (Symbol, &'a [u8]);
Expand Down
Loading
Loading