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

bump rust to 1.82 #11876

Merged
merged 3 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.81" # MSRV
toolchain: "1.82" # MSRV
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
- uses: dtolnay/rust-toolchain@nightly
- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.81" # MSRV
toolchain: "1.82" # MSRV
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
Expand Down
6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace.package]
version = "1.1.0"
edition = "2021"
rust-version = "1.81"
rust-version = "1.82"
license = "MIT OR Apache-2.0"
homepage = "https://paradigmxyz.github.io/reth"
repository = "https://github.com/paradigmxyz/reth"
Expand Down Expand Up @@ -410,9 +410,7 @@ reth-trie-db = { path = "crates/trie/db" }
reth-trie-parallel = { path = "crates/trie/parallel" }

# revm
revm = { version = "14.0.3", features = [
"std",
], default-features = false }
revm = { version = "14.0.3", features = ["std"], default-features = false }
revm-inspectors = "0.8.1"
revm-primitives = { version = "10.0.0", features = [
"std",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ When updating this, also update:
- .github/workflows/lint.yml
-->

The Minimum Supported Rust Version (MSRV) of this project is [1.81.0](https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html).
The Minimum Supported Rust Version (MSRV) of this project is [1.82.0](https://blog.rust-lang.org/2024/10/17/Rust-1.82.0.html).

See the book for detailed instructions on how to [build from source](https://paradigmxyz.github.io/reth/installation/source.html).

Expand Down
18 changes: 16 additions & 2 deletions clippy.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
msrv = "1.81"
msrv = "1.82"
too-large-for-stack = 128
doc-valid-idents = ["P2P", "ExEx", "ExExes", "IPv4", "IPv6", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "WAL", "MessagePack"]
doc-valid-idents = [
"P2P",
"ExEx",
"ExExes",
"IPv4",
"IPv6",
"KiB",
"MiB",
"GiB",
"TiB",
"PiB",
"EiB",
"WAL",
"MessagePack",
]
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ impl StaticFileProvider {
// appending/truncating rows
for segment in event.paths {
// Ensure it's a file with the .conf extension
if !segment
if segment
.extension()
.is_some_and(|s| s.to_str() == Some(CONFIG_FILE_EXTENSION))
.is_none_or(|s| s.to_str() != Some(CONFIG_FILE_EXTENSION))
tcoratger marked this conversation as resolved.
Show resolved Hide resolved
{
continue
}
Expand Down
Loading